Fix freestyle renders not including some types of animation.

Freestyle Python scripts need to get the evaluated view layer and scene,
not the original one.

2 files changed, 14 insertions, 1 deletions

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
index ce3b2538274..04cb8d12a0c 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
@@ -42,8 +42,9 @@
 #include "BLI_string.h"
 
 extern "C" {
-#include "DNA_node_types.h"
+#include "DNA_freestyle_types.h"
 #include "DNA_layer_types.h"
+#include "DNA_node_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
@@ -155,6 +156,12 @@ void DepsgraphNodeBuilder::build_view_layer(
 	if (view_layer->mat_override != NULL) {
 		build_material(view_layer->mat_override);
 	}
+	/* Freestyle collections. */
+	LISTBASE_FOREACH (FreestyleLineSet *, fls, &view_layer->freestyle_config.linesets) {
+		if (fls->group != NULL) {
+			build_collection(NULL, fls->group);
+		}
+	}
 	/* Collections. */
 	add_operation_node(&scene->id,
 	                   DEG_NODE_TYPE_LAYER_COLLECTIONS,
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
index f77d47874a2..200ac4531c6 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
@@ -136,6 +136,12 @@ void DepsgraphRelationBuilder::build_view_layer(Scene *scene, ViewLayer *view_la
 	if (view_layer->mat_override != NULL) {
 		build_material(view_layer->mat_override);
 	}
+	/* Freestyle collections. */
+	LISTBASE_FOREACH (FreestyleLineSet *, fls, &view_layer->freestyle_config.linesets) {
+		if (fls->group != NULL) {
+			build_collection(NULL, NULL, fls->group);
+		}
+	}
 	/* Build all set scenes. */
 	if (scene->set != NULL) {
 		ViewLayer *set_view_layer = BKE_view_layer_default_render(scene->set);