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:
authorLukas Tönne <lukas.toenne@gmail.com>2016-05-12 10:54:08 +0300
committerLukas Tönne <lukas.toenne@gmail.com>2016-05-12 10:55:48 +0300
commitea41207c3b5ff301ff4274235b3199b2b82a9a29 (patch)
tree43e014a6ae8172bd23b42d4bea08be9a4893c6d9
parent80b1adf8c2e8f76994403ab60a85b9332b58e7fc (diff)
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.
-rw-r--r--source/blender/depsgraph/intern/depsgraph_build_relations.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_build_relations.cc b/source/blender/depsgraph/intern/depsgraph_build_relations.cc
index 226991e7b11..8b133e4c7ca 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...