blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

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.
This commit is contained in:
Sergey Sharybin 2019-05-23 14:28:57 +02:00
parent 08690be3b5
commit 44f9a502e7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
View File

@ -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) {