Commit: d22999c6139ff8c1789bd53425488f0e2d99bfb2
Author: Joshua Leung
Date: Tue Dec 16 17:11:56 2014 +1300
Branches: depsgraph_refactor
https://developer.blender.org/rBd22999c6139ff8c1789bd53425488f0e2d99bfb2
WIP: Added in a (commented out) position for verify_entry_exit_ops()
The commented out version does away with the superfluous auto-generated noops,
which get added because we can't tell if any node is an entry/exit at the
time of doing that
===================================================================
M source/blender/depsgraph/intern/depsgraph_build.cpp
===================================================================
diff --git a/source/blender/depsgraph/intern/depsgraph_build.cpp
b/source/blender/depsgraph/intern/depsgraph_build.cpp
index e8f6131..51524d9 100644
--- a/source/blender/depsgraph/intern/depsgraph_build.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_build.cpp
@@ -472,8 +472,10 @@ void DEG_graph_build_from_scene(Depsgraph *graph, Main
*bmain, Scene *scene)
node_builder.add_root_node();
node_builder.build_scene(scene);
+ // XXX: this exists, but may break some other cases later...
node_builder.verify_entry_exit_operations();
+
DepsgraphRelationBuilder relation_builder(graph);
/* hook scene up to the root node as entrypoint to graph */
/* XXX what does this relation actually mean?
@@ -482,6 +484,9 @@ void DEG_graph_build_from_scene(Depsgraph *graph, Main
*bmain, Scene *scene)
//relation_builder.add_relation(RootKey(), IDKey(scene),
DEPSREL_TYPE_ROOT_TO_ACTIVE, "Root to Active Scene");
relation_builder.build_scene(scene);
+ /* only now add entry/exit nodes, now that we know what relations each
node will have */
+ //node_builder.verify_entry_exit_operations();
+
#if 0
/* sort nodes to determine evaluation order (in most cases) */
DEG_graph_sort(graph);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
