diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-03-28 13:04:00 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-03-28 13:04:00 +0300 |
commit | 5bcca7ae9296408717449d24a4bc9ca6e30e3c44 (patch) | |
tree | 004a5c77cbb0b9dfefa3707b9d7a762ddaea7e67 /source/blender/depsgraph | |
parent | fdf92b923a349d17f4de43d3f047c0445077c3ab (diff) |
Depsgraph: Fix dependency cycle when adding rigid body
Was a mistake in the recent change.
The idea here is: manual should invalidate point cache, but
rigid body simulation should only happen after point cache
was ensured to be in the correct state.
Diffstat (limited to 'source/blender/depsgraph')
-rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 444502b9538..33850181f60 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -976,14 +976,14 @@ void DepsgraphRelationBuilder::build_object_pointcache(Object *object) } /* Manual edits to any dependency (or self) should reset the point cache. */ if (!BLI_listbase_is_empty(&ptcache_id_list)) { - OperationKey transform_simulation_init_key( + OperationKey transform_eval_key( &object->id, NodeType::TRANSFORM, - OperationCode::TRANSFORM_SIMULATION_INIT); + OperationCode::TRANSFORM_EVAL); OperationKey geometry_init_key(&object->id, NodeType::GEOMETRY, OperationCode::GEOMETRY_EVAL_INIT); - add_relation(transform_simulation_init_key, + add_relation(transform_eval_key, point_cache_key, "Transform Simulation -> Point Cache", RELATION_FLAG_FLUSH_USER_EDIT_ONLY); |