[Bf-blender-cvs] [1edf225] depsgraph_refactor: Depsgrpah: Some tweaks to proxies
Sergey Sharybin
noreply at git.blender.org
Fri Feb 6 12:39:00 CET 2015
Commit: 1edf225607c2d6ac60afbc2cd278d1834693e978
Author: Sergey Sharybin
Date: Fri Feb 6 16:37:26 2015 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rB1edf225607c2d6ac60afbc2cd278d1834693e978
Depsgrpah: Some tweaks to proxies
Basically made them working closer to old dependency graph.
>From quick tests seems they're working, but some stuff to be considered:
- Do we still need inverted relation between proxy and original object?
- We probably need to skip original object evaluation in depsgraph
traversal.
===================================================================
M source/blender/depsgraph/intern/depsgraph_build_relations.cpp
===================================================================
diff --git a/source/blender/depsgraph/intern/depsgraph_build_relations.cpp b/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
index 330b9ae..ee68cef 100644
--- a/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
@@ -168,15 +168,18 @@ void DepsgraphRelationBuilder::build_scene(Scene *scene)
/* object itself */
build_object(scene, ob);
-
-#if 0
+
/* object that this is a proxy for */
- // XXX: the way that proxies work needs to be completely reviewed!
if (ob->proxy) {
build_object(scene, ob->proxy);
+ /* TODO(sergey): This is an inverted relation, matches old depsgraph
+ * behavior and need to be investigated if it still need to be inverted.
+ */
+ ComponentKey ob_pose_key(&ob->id, DEPSNODE_TYPE_EVAL_POSE);
+ ComponentKey proxy_pose_key(&ob->proxy->id, DEPSNODE_TYPE_TRANSFORM);
+ add_relation(ob_pose_key, proxy_pose_key, DEPSREL_TYPE_TRANSFORM, "Proxy");
}
-#endif
-
+
#if 0
/* handled in next loop...
* NOTE: in most cases, setting dupli-group means that we may want
More information about the Bf-blender-cvs
mailing list