Commit: 3a9b0d3a14939ae5c7fd83a216d54aa42ad99c58
Author: Joshua Leung
Date: Wed Dec 17 15:41:59 2014 +1300
Branches: depsgraph_refactor
https://developer.blender.org/rB3a9b0d3a14939ae5c7fd83a216d54aa42ad99c58
Bugfix: add_relation() now works again
This was broken by an earlier attempt to grab debugging info for nodes,
which ended up preventing the templates from matching correctly
===================================================================
M source/blender/depsgraph/intern/depsgraph_build.h
===================================================================
diff --git a/source/blender/depsgraph/intern/depsgraph_build.h
b/source/blender/depsgraph/intern/depsgraph_build.h
index f33cb68..bbeb9d3b 100644
--- a/source/blender/depsgraph/intern/depsgraph_build.h
+++ b/source/blender/depsgraph/intern/depsgraph_build.h
@@ -292,8 +292,9 @@ void DepsgraphRelationBuilder::add_relation(const KeyFrom
&key_from, const KeyTo
DepsNode *node_from = find_node(key_from);
DepsNode *node_to = find_node(key_to);
- OperationDepsNode *op_from = get_exit_operation(node_from);
- OperationDepsNode *op_to = get_entry_operation(node_to);
+ // XXX: warning - don't use node_from and node_to directly, as that
breaks the templates...
+ OperationDepsNode *op_from = get_exit_operation(find_node(key_from));
+ OperationDepsNode *op_to = get_entry_operation(find_node(key_to));
if (op_from && op_to) {
add_operation_relation(op_from, op_to, type, description);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
