diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-02-19 20:10:35 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-02-19 20:13:05 +0300 |
commit | f0a22f5dd08561637ae3487f2d91ec566687e7c4 (patch) | |
tree | c256acdc7fcb3aa8b28f1ba27f372211760208bf /source/blender/depsgraph/intern/node | |
parent | ee5c13c45ccac38c20fe5e428f522d546262f1b3 (diff) |
Fix T73932: modifying keyframes in nodes fails when there is an image sequence
Image animation should not be an depsgraph node of type ANIMATION, there is
no need for it to be affected by the special casing for that.
Diffstat (limited to 'source/blender/depsgraph/intern/node')
4 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/depsgraph/intern/node/deg_node.cc b/source/blender/depsgraph/intern/node/deg_node.cc index 5002f2890ae..d95e05a6f4f 100644 --- a/source/blender/depsgraph/intern/node/deg_node.cc +++ b/source/blender/depsgraph/intern/node/deg_node.cc @@ -100,6 +100,8 @@ const char *nodeTypeAsString(NodeType type) return "CACHE"; case NodeType::POINT_CACHE: return "POINT_CACHE"; + case NodeType::IMAGE_ANIMATION: + return "IMAGE_ANIMATION"; case NodeType::BATCH_CACHE: return "BATCH_CACHE"; case NodeType::DUPLI: @@ -157,6 +159,7 @@ eDepsSceneComponentType nodeTypeToSceneComponent(NodeType type) case NodeType::PARTICLE_SETTINGS: case NodeType::SHADING_PARAMETERS: case NodeType::POINT_CACHE: + case NodeType::IMAGE_ANIMATION: case NodeType::BATCH_CACHE: case NodeType::DUPLI: case NodeType::SYNCHRONIZATION: @@ -238,6 +241,7 @@ eDepsObjectComponentType nodeTypeToObjectComponent(NodeType type) case NodeType::PARTICLE_SETTINGS: case NodeType::SHADING_PARAMETERS: case NodeType::POINT_CACHE: + case NodeType::IMAGE_ANIMATION: case NodeType::BATCH_CACHE: case NodeType::DUPLI: case NodeType::SYNCHRONIZATION: diff --git a/source/blender/depsgraph/intern/node/deg_node.h b/source/blender/depsgraph/intern/node/deg_node.h index 3878362d936..ffa37341ea6 100644 --- a/source/blender/depsgraph/intern/node/deg_node.h +++ b/source/blender/depsgraph/intern/node/deg_node.h @@ -114,6 +114,8 @@ enum class NodeType { SHADING_PARAMETERS, /* Point cache Component */ POINT_CACHE, + /* Image Animation Component */ + IMAGE_ANIMATION, /* Cache Component */ /* TODO(sergey); Verify that we really need this. */ CACHE, diff --git a/source/blender/depsgraph/intern/node/deg_node_component.cc b/source/blender/depsgraph/intern/node/deg_node_component.cc index 334f55c0942..73f9668eb5d 100644 --- a/source/blender/depsgraph/intern/node/deg_node_component.cc +++ b/source/blender/depsgraph/intern/node/deg_node_component.cc @@ -349,6 +349,7 @@ DEG_COMPONENT_NODE_DEFINE(BatchCache, BATCH_CACHE, ID_RECALC_SHADING); DEG_COMPONENT_NODE_DEFINE(Bone, BONE, ID_RECALC_GEOMETRY); DEG_COMPONENT_NODE_DEFINE(Cache, CACHE, 0); DEG_COMPONENT_NODE_DEFINE(CopyOnWrite, COPY_ON_WRITE, ID_RECALC_COPY_ON_WRITE); +DEG_COMPONENT_NODE_DEFINE(ImageAnimation, IMAGE_ANIMATION, 0); DEG_COMPONENT_NODE_DEFINE(Geometry, GEOMETRY, ID_RECALC_GEOMETRY); DEG_COMPONENT_NODE_DEFINE(LayerCollections, LAYER_COLLECTIONS, 0); DEG_COMPONENT_NODE_DEFINE(Parameters, PARAMETERS, 0); @@ -383,6 +384,7 @@ void deg_register_component_depsnodes() register_node_typeinfo(&DNTI_PARTICLE_SYSTEM); register_node_typeinfo(&DNTI_PARTICLE_SETTINGS); register_node_typeinfo(&DNTI_POINT_CACHE); + register_node_typeinfo(&DNTI_IMAGE_ANIMATION); register_node_typeinfo(&DNTI_PROXY); register_node_typeinfo(&DNTI_EVAL_POSE); register_node_typeinfo(&DNTI_SEQUENCER); diff --git a/source/blender/depsgraph/intern/node/deg_node_component.h b/source/blender/depsgraph/intern/node/deg_node_component.h index c25f0bbd7aa..6a2157fa3b2 100644 --- a/source/blender/depsgraph/intern/node/deg_node_component.h +++ b/source/blender/depsgraph/intern/node/deg_node_component.h @@ -172,6 +172,7 @@ DEG_COMPONENT_NODE_DECLARE_NO_COW_TAG_ON_UPDATE(BatchCache); DEG_COMPONENT_NODE_DECLARE_GENERIC(Cache); DEG_COMPONENT_NODE_DECLARE_GENERIC(CopyOnWrite); DEG_COMPONENT_NODE_DECLARE_GENERIC(Geometry); +DEG_COMPONENT_NODE_DECLARE_GENERIC(ImageAnimation); DEG_COMPONENT_NODE_DECLARE_GENERIC(LayerCollections); DEG_COMPONENT_NODE_DECLARE_GENERIC(Parameters); DEG_COMPONENT_NODE_DECLARE_GENERIC(Particles); |