diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-05-23 15:28:57 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-05-23 15:30:37 +0300 |
| commit | 44f9a502e7e7713c1760ffd59539d927211031fe (patch) | |
| tree | d550a44468830a3029426e59b87d43695c73c28b /source | |
| parent | 08690be3b5b89e8dc806fa5af9335a39740bb9e0 (diff) | |
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.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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) { |