[Bf-blender-cvs] [12865caf4f3] blender-v2.82-release: Alembic depsgraph: explicitly add ANIMATION -> CACHE dependency
Sybren A. Stüvel
noreply at git.blender.org
Tue Jan 28 17:58:35 CET 2020
Commit: 12865caf4f3dd48f343db7167b20e303160004a3
Author: Sybren A. Stüvel
Date: Tue Jan 28 17:56:53 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rB12865caf4f3dd48f343db7167b20e303160004a3
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.
===================================================================
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 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) {
More information about the Bf-blender-cvs
mailing list