[Bf-blender-cvs] [262504ddd19] blender2.8: Fix T57384: Depsgraph assert after loading file with Mask Node
Philipp Oeser
noreply at git.blender.org
Mon Oct 29 10:43:20 CET 2018
Commit: 262504ddd190a66f9d8353afc2c2da653a998cc4
Author: Philipp Oeser
Date: Fri Oct 26 10:32:57 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB262504ddd190a66f9d8353afc2c2da653a998cc4
Fix T57384: Depsgraph assert after loading file with Mask Node
Maniphest Tasks: T57384
Differential Revision: https://developer.blender.org/D3831
===================================================================
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
===================================================================
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 1aabb926d29..f929517f683 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -1443,6 +1443,9 @@ void DepsgraphNodeBuilder::build_nodetree(bNodeTree *ntree)
else if (id_type == ID_TXT) {
/* Ignore script nodes. */
}
+ else if (id_type == ID_MSK) {
+ build_mask((Mask *)id);
+ }
else if (id_type == ID_MC) {
build_movieclip((MovieClip *)id);
}
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index c025bcd41d8..960e49416c1 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -2167,6 +2167,9 @@ void DepsgraphRelationBuilder::build_nodetree(bNodeTree *ntree)
else if (id_type == ID_TXT) {
/* Ignore script nodes. */
}
+ else if (id_type == ID_MSK) {
+ build_mask((Mask *)id);
+ }
else if (id_type == ID_MC) {
build_movieclip((MovieClip *)id);
}
More information about the Bf-blender-cvs
mailing list