diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-01-28 19:56:53 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-01-28 19:58:19 +0300 |
commit | 12865caf4f3dd48f343db7167b20e303160004a3 (patch) | |
tree | ba7caecf46582e6160eab054c3655adbde884807 /source/blender/depsgraph | |
parent | 5d36a2e587590515fb38b4dee71f49b47a339178 (diff) |
Alembic depsgraph: explicitly add ANIMATION -> CACHE dependency
This dependency was removed in fd0bc7e002ced8ffd85e9aa3edcae173dbd13392,
as there already were dependencies ANIMATION -> PARAMETERS and
PARAMETERS -> CACHE, making ANIMATION -> CACHE unnecessary.
Upon subsequent inspection, the ANIMATION -> PARAMETERS dependency was
there due to the fallback behaviour in
`RNANodeQuery::construct_node_identifier()`. Now this is no longer
relied upon, and the required relation is made explicit again.
Diffstat (limited to 'source/blender/depsgraph')
-rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 10 |
1 files changed, 7 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 a980042a974..582176a852d 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -2369,12 +2369,16 @@ void DepsgraphRelationBuilder::build_cachefile(CacheFile *cache_file) /* Animation. */ build_animdata(&cache_file->id); build_parameters(&cache_file->id); - if (check_id_has_anim_component(&cache_file->id) || - check_id_has_driver_component(&cache_file->id)) { - ComponentKey animation_key(&cache_file->id, NodeType::PARAMETERS); + if (check_id_has_anim_component(&cache_file->id)) { + ComponentKey animation_key(&cache_file->id, NodeType::ANIMATION); ComponentKey datablock_key(&cache_file->id, NodeType::CACHE); add_relation(animation_key, datablock_key, "Datablock Animation"); } + if (check_id_has_driver_component(&cache_file->id)) { + ComponentKey animation_key(&cache_file->id, NodeType::PARAMETERS); + ComponentKey datablock_key(&cache_file->id, NodeType::CACHE); + add_relation(animation_key, datablock_key, "Drivers -> Cache Eval"); + } /* Cache file updates */ if (cache_file->is_sequence) { |