diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-20 13:32:22 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-20 13:32:22 +0300 |
| commit | e6bdc950d25ca9f57effaebe0d4505038901a610 (patch) | |
| tree | 1a43f506293deadf1cb2edd28d1bcdef3778db1c /source/blender/depsgraph/intern/node | |
| parent | c57f1f3d2786ede19946ef77cd4d10e2b676dc0d (diff) | |
Fix T61689: Crash when having image and regular animation
Was caused by ambiguity in entry/exit operation for animation channel.
Made those explicit now,
Diffstat (limited to 'source/blender/depsgraph/intern/node')
| -rw-r--r-- | source/blender/depsgraph/intern/node/deg_node_operation.cc | 4 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/node/deg_node_operation.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.cc b/source/blender/depsgraph/intern/node/deg_node_operation.cc index 0d3ec70d22c..f852a32450d 100644 --- a/source/blender/depsgraph/intern/node/deg_node_operation.cc +++ b/source/blender/depsgraph/intern/node/deg_node_operation.cc @@ -43,7 +43,9 @@ const char *operationCodeAsString(OperationCode opcode) case OperationCode::ID_PROPERTY: return "ID_PROPERTY"; case OperationCode::PARAMETERS_EVAL: return "PARAMETERS_EVAL"; /* Animation, Drivers, etc. */ - case OperationCode::ANIMATION: return "ANIMATION"; + case OperationCode::ANIMATION_ENTRY: return "ANIMATION_ENTRY"; + case OperationCode::ANIMATION_EVAL: return "ANIMATION_EVAL"; + case OperationCode::ANIMATION_EXIT: return "ANIMATION_EXIT"; case OperationCode::DRIVER: return "DRIVER"; /* Scene related. */ case OperationCode::SCENE_EVAL: return "SCENE_EVAL"; diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.h b/source/blender/depsgraph/intern/node/deg_node_operation.h index da823595705..8ec71d1829f 100644 --- a/source/blender/depsgraph/intern/node/deg_node_operation.h +++ b/source/blender/depsgraph/intern/node/deg_node_operation.h @@ -51,7 +51,9 @@ enum class OperationCode { /* Animation, Drivers, etc. --------------------------------------------- */ /* NLA + Action */ - ANIMATION, + ANIMATION_ENTRY, + ANIMATION_EVAL, + ANIMATION_EXIT, /* Driver */ DRIVER, |