Merge branch 'master' into blender2.8
[blender.git] / source / blender / depsgraph / intern / depsgraph_build_nodes.cc
index 04bda740068b13da4f6148e9ace484ba099cb7a4..c29532a02c6d4dec51870c4e1ecedadeff12a0b6 100644 (file)
@@ -246,6 +246,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);