Commit: f036fa079cdc667a33f4b4f35eb9cc937deb7a32
Author: Lukas Tönne
Date: Sun Dec 27 14:35:06 2015 +0100
Branches: object_nodes
https://developer.blender.org/rBf036fa079cdc667a33f4b4f35eb9cc937deb7a32
ID.flag has been split to put runtime tags in a separate field (rB3fcf535d).
===================================================================
M source/blender/depsgraph/intern/depsgraph_build_nodes.cc
M source/blender/depsgraph/intern/depsgraph_build_relations.cc
===================================================================
diff --git a/source/blender/depsgraph/intern/depsgraph_build_nodes.cc
b/source/blender/depsgraph/intern/depsgraph_build_nodes.cc
index 308649a..294aada 100644
--- a/source/blender/depsgraph/intern/depsgraph_build_nodes.cc
+++ b/source/blender/depsgraph/intern/depsgraph_build_nodes.cc
@@ -1122,7 +1122,7 @@ void DepsgraphNodeBuilder::build_lamp(Object *ob)
void DepsgraphNodeBuilder::build_nodetree(DepsNode *owner_node, bNodeTree
*ntree)
{
- if (!ntree || (ntree->id.flag & LIB_DOIT) != 0)
+ if (!ntree || (ntree->id.tag & LIB_TAG_DOIT) != 0)
return;
/* nodetree itself */
diff --git a/source/blender/depsgraph/intern/depsgraph_build_relations.cc
b/source/blender/depsgraph/intern/depsgraph_build_relations.cc
index ccf15c6..72b7e57 100644
--- a/source/blender/depsgraph/intern/depsgraph_build_relations.cc
+++ b/source/blender/depsgraph/intern/depsgraph_build_relations.cc
@@ -1851,9 +1851,9 @@ void DepsgraphRelationBuilder::build_lamp(Object *ob)
void DepsgraphRelationBuilder::build_nodetree(ID *owner, bNodeTree *ntree)
{
- if (!ntree || (ntree->id.flag & LIB_DOIT) != 0)
+ if (!ntree || (ntree->id.tag & LIB_TAG_DOIT) != 0)
return;
- ntree->id.flag |= LIB_DOIT;
+ ntree->id.tag |= LIB_TAG_DOIT;
ID *ntree_id = &ntree->id;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
