Commit: 95b1cf6f7d510cc152f8f559936454afe1f1fbd9
Author: Sergey Sharybin
Date: Wed Jul 13 10:55:35 2016 +0200
Branches: master
https://developer.blender.org/rB95b1cf6f7d510cc152f8f559936454afe1f1fbd9
Depsgraph: Make proxy behavior closer to old depsgraph
Fixes possible missing update of proxy_from pointer before using
it in relations builder.
===================================================================
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
===================================================================
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index b05d775..a397b48 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -442,7 +442,7 @@ void DepsgraphNodeBuilder::build_object(Scene *scene, Base
*base, Object *ob)
}
case OB_ARMATURE: /* Pose */
- if (ob->id.lib != NULL && ob->proxy_from !=
NULL) {
+ if (ID_IS_LINKED_DATABLOCK(ob) &&
ob->proxy_from != NULL) {
build_proxy_rig(ob);
}
else {
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 4444545..1662dfc 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -271,6 +271,7 @@ void DepsgraphRelationBuilder::build_scene(Main *bmain,
Scene *scene)
/* object that this is a proxy for */
if (ob->proxy) {
+ ob->proxy->proxy_from = ob;
build_object(bmain, 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.
@@ -433,9 +434,8 @@ void DepsgraphRelationBuilder::build_object(Main *bmain,
Scene *scene, Object *o
break;
}
-
case OB_ARMATURE: /* Pose */
- if (ob->id.lib != NULL && ob->proxy_from !=
NULL) {
+ if (ID_IS_LINKED_DATABLOCK(ob) &&
ob->proxy_from != NULL) {
build_proxy_rig(ob);
}
else {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
