[Bf-blender-cvs] [44f9a502e7e] master: Depsgraph: Correct relations for proxy group
Sergey Sharybin
noreply at git.blender.org
Thu May 23 14:30:40 CEST 2019
Commit: 44f9a502e7e7713c1760ffd59539d927211031fe
Author: Sergey Sharybin
Date: Thu May 23 14:28:57 2019 +0200
Branches: master
https://developer.blender.org/rB44f9a502e7e7713c1760ffd59539d927211031fe
Depsgraph: Correct relations for proxy group
At some point when the transform evaluation was split into EVAL and FINAL
the b350edc was re-introduced by EVAL being run prior to proxy_group's
matrix is evaluated.
===================================================================
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
===================================================================
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 5686bcac5cb..ad78e90993d 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -563,6 +563,7 @@ void DepsgraphRelationBuilder::build_object(Base *base, Object *object)
&object->id, NodeType::TRANSFORM, OperationCode::TRANSFORM_LOCAL);
OperationKey parent_transform_key(
&object->id, NodeType::TRANSFORM, OperationCode::TRANSFORM_PARENT);
+ OperationKey transform_eval_key(&object->id, NodeType::TRANSFORM, OperationCode::TRANSFORM_EVAL);
OperationKey final_transform_key(
&object->id, NodeType::TRANSFORM, OperationCode::TRANSFORM_FINAL);
OperationKey ob_eval_key(&object->id, NodeType::TRANSFORM, OperationCode::TRANSFORM_EVAL);
@@ -647,7 +648,7 @@ void DepsgraphRelationBuilder::build_object(Base *base, Object *object)
build_object(NULL, object->proxy_group);
OperationKey proxy_group_eval_key(
&object->proxy_group->id, NodeType::TRANSFORM, OperationCode::TRANSFORM_EVAL);
- add_relation(proxy_group_eval_key, final_transform_key, "Proxy Group Transform");
+ add_relation(proxy_group_eval_key, transform_eval_key, "Proxy Group Transform");
}
/* Object dupligroup. */
if (object->instance_collection != NULL) {
More information about the Bf-blender-cvs
mailing list