[Bf-blender-cvs] [ea41207] master: Fix depsgraph tagging during the relations build pass.
Lukas Tönne
noreply at git.blender.org
Thu May 12 09:55:55 CEST 2016
Commit: ea41207c3b5ff301ff4274235b3199b2b82a9a29
Author: Lukas Tönne
Date: Thu May 12 09:54:08 2016 +0200
Branches: master
https://developer.blender.org/rBea41207c3b5ff301ff4274235b3199b2b82a9a29
Fix depsgraph tagging during the relations build pass.
Followup commit to 18e5e2fa1ac26ccbbd0cc8b486a5d92be6888021. Needs the same
treatment in the second pass when ID tags are reset again.
===================================================================
M source/blender/depsgraph/intern/depsgraph_build_relations.cc
===================================================================
diff --git a/source/blender/depsgraph/intern/depsgraph_build_relations.cc b/source/blender/depsgraph/intern/depsgraph_build_relations.cc
index 226991e..8b133e4 100644
--- a/source/blender/depsgraph/intern/depsgraph_build_relations.cc
+++ b/source/blender/depsgraph/intern/depsgraph_build_relations.cc
@@ -244,6 +244,13 @@ void DepsgraphRelationBuilder::build_scene(Main *bmain, Scene *scene)
* created or not.
*/
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
if (scene->set) {
// TODO: link set to scene, especially our timesource...
More information about the Bf-blender-cvs
mailing list