[Bf-blender-cvs] [18e5e2f] master: Fix for node tree ID tagging in new depsgraph.
Lukas Tönne
noreply at git.blender.org
Wed May 11 10:53:21 CEST 2016
Commit: 18e5e2fa1ac26ccbbd0cc8b486a5d92be6888021
Author: Lukas Tönne
Date: Wed May 11 10:51:10 2016 +0200
Branches: master
https://developer.blender.org/rB18e5e2fa1ac26ccbbd0cc8b486a5d92be6888021
Fix for node tree ID tagging in new depsgraph.
Nested node trees are not handled in BKE_main_id_tag_all.
===================================================================
M source/blender/depsgraph/intern/depsgraph_build_nodes.cc
===================================================================
diff --git a/source/blender/depsgraph/intern/depsgraph_build_nodes.cc b/source/blender/depsgraph/intern/depsgraph_build_nodes.cc
index 80961a6..be706ff 100644
--- a/source/blender/depsgraph/intern/depsgraph_build_nodes.cc
+++ b/source/blender/depsgraph/intern/depsgraph_build_nodes.cc
@@ -248,6 +248,13 @@ void DepsgraphNodeBuilder::build_scene(Main *bmain, Scene *scene)
* needed.
*/
BKE_main_id_tag_all(bmain, LIB_TAG_DOIT, false);
+ /* XXX nested node trees are not included in tag-clearing above,
+ * so we need to do this manually.
+ */
+ FOREACH_NODETREE(bmain, nodetree, id) {
+ if (id != (ID *)nodetree)
+ nodetree->id.tag &= ~LIB_TAG_DOIT;
+ } FOREACH_NODETREE_END
/* scene ID block */
add_id_node(&scene->id);
More information about the Bf-blender-cvs
mailing list