[Bf-blender-cvs] [e944000] object_nodes: Reenabled the depsgraph relations for nested node trees, for the time being.

Lukas Tönne noreply at git.blender.org
Fri Dec 11 10:00:00 CET 2015


Commit: e94400084c65d40d077ab273471be4ef53a3601f
Author: Lukas Tönne
Date:   Fri Dec 11 09:44:41 2015 +0100
Branches: object_nodes
https://developer.blender.org/rBe94400084c65d40d077ab273471be4ef53a3601f

Reenabled the depsgraph relations for nested node trees, for the time being.

This should also work through the API! However, it requires building the nodetree
depsnodes before making relations which is not well supported yet.
The forced relations are currently needed to make updates inside the component
node trees trigger object recalc.

===================================================================

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 94f9035..d93438c 100644
--- a/source/blender/depsgraph/intern/depsgraph_build_relations.cc
+++ b/source/blender/depsgraph/intern/depsgraph_build_relations.cc
@@ -1835,8 +1835,6 @@ void DepsgraphRelationBuilder::build_nodetree(ID *owner, bNodeTree *ntree)
 				add_relation(group_parameters_key, parameters_key,
 				             DEPSREL_TYPE_COMPONENT_ORDER, "Group Node");
 			}
-			
-#if 0
 			/* XXX this is weak - include it in rna update! */
 			else if (GS(bnode->id->name) == ID_NT) {
 				bNodeTree *group_ntree = (bNodeTree *)bnode->id;
@@ -1851,7 +1849,6 @@ void DepsgraphRelationBuilder::build_nodetree(ID *owner, bNodeTree *ntree)
 				add_relation(group_parameters_key, parameters_key,
 				             DEPSREL_TYPE_COMPONENT_ORDER, "Group Node");
 			}
-#endif
 		}
 	}




More information about the Bf-blender-cvs mailing list