diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-20 13:48:42 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-20 13:48:42 +0300 |
| commit | c985c60bdc7cfc6914d583cf5179a03aaa68b302 (patch) | |
| tree | fd6e53c5219de8ee806bb99d06797becf1ae6cc9 /source/blender/depsgraph/intern/node | |
| parent | e6bdc950d25ca9f57effaebe0d4505038901a610 (diff) | |
Depsgraph: Fix relation when lamp has driver on custom property
Was once again caused by an ambiguity of the entry/exit operations.
Only did for objects since those are the only one who needs this.
The rest types of IDs needs to be checked and only added extra
operations if needed (adding operations and relations causes some
overhead for evaluation, so need to be careful).
Diffstat (limited to 'source/blender/depsgraph/intern/node')
| -rw-r--r-- | source/blender/depsgraph/intern/node/deg_node_operation.cc | 2 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/node/deg_node_operation.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.cc b/source/blender/depsgraph/intern/node/deg_node_operation.cc index f852a32450d..893c108dc5a 100644 --- a/source/blender/depsgraph/intern/node/deg_node_operation.cc +++ b/source/blender/depsgraph/intern/node/deg_node_operation.cc @@ -41,7 +41,9 @@ const char *operationCodeAsString(OperationCode opcode) /* Generic Operations. */ case OperationCode::OPERATION: return "OPERATION"; case OperationCode::ID_PROPERTY: return "ID_PROPERTY"; + case OperationCode::PARAMETERS_ENTRY: return "PARAMETERS_ENTRY"; case OperationCode::PARAMETERS_EVAL: return "PARAMETERS_EVAL"; + case OperationCode::PARAMETERS_EXIT: return "PARAMETERS_EXIT"; /* Animation, Drivers, etc. */ case OperationCode::ANIMATION_ENTRY: return "ANIMATION_ENTRY"; case OperationCode::ANIMATION_EVAL: return "ANIMATION_EVAL"; diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.h b/source/blender/depsgraph/intern/node/deg_node_operation.h index 8ec71d1829f..c6db7b012d7 100644 --- a/source/blender/depsgraph/intern/node/deg_node_operation.h +++ b/source/blender/depsgraph/intern/node/deg_node_operation.h @@ -47,7 +47,9 @@ enum class OperationCode { /* Generic parameters evaluation. */ ID_PROPERTY, + PARAMETERS_ENTRY, PARAMETERS_EVAL, + PARAMETERS_EXIT, /* Animation, Drivers, etc. --------------------------------------------- */ /* NLA + Action */ |