Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@blender.org>2020-01-21 13:13:47 +0300
committerSybren A. Stüvel <sybren@blender.org>2020-01-21 13:13:47 +0300
commit463941b6a17369d9cdc8030c03b261763837b13d (patch)
treea10b8ddf25c403652f4b69394442285f4999f265 /source/blender/depsgraph/intern/builder/deg_builder_relations.cc
parentc81549af28d1fb50b1f44f71cd2e2218746ec262 (diff)
parent9f66062da73e954f7c00acd9d5d5ead9ac1e8863 (diff)
Merge remote-tracking branch 'origin/blender-v2.82-release'
Diffstat (limited to 'source/blender/depsgraph/intern/builder/deg_builder_relations.cc')
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_relations.cc16
1 files changed, 16 insertions, 0 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 31c1b0361f8..bc428dd755f 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -47,6 +47,7 @@ extern "C" {
#include "DNA_gpencil_types.h"
#include "DNA_key_types.h"
#include "DNA_light_types.h"
+#include "DNA_linestyle_types.h"
#include "DNA_material_types.h"
#include "DNA_mask_types.h"
#include "DNA_mesh_types.h"
@@ -536,6 +537,9 @@ void DepsgraphRelationBuilder::build_id(ID *id)
case ID_MSK:
build_mask((Mask *)id);
break;
+ case ID_LS:
+ build_freestyle_linestyle((FreestyleLineStyle *)id);
+ break;
case ID_MC:
build_movieclip((MovieClip *)id);
break;
@@ -2429,6 +2433,18 @@ void DepsgraphRelationBuilder::build_mask(Mask *mask)
}
}
+void DepsgraphRelationBuilder::build_freestyle_linestyle(FreestyleLineStyle *linestyle)
+{
+ if (built_map_.checkIsBuiltAndTag(linestyle)) {
+ return;
+ }
+
+ ID *linestyle_id = &linestyle->id;
+ build_parameters(linestyle_id);
+ build_animdata(linestyle_id);
+ build_nodetree(linestyle->nodetree);
+}
+
void DepsgraphRelationBuilder::build_movieclip(MovieClip *clip)
{
if (built_map_.checkIsBuiltAndTag(clip)) {