diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-01 12:56:01 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-01 17:40:19 +0300 |
| commit | 0d2dfd2e2d40ba28f877331b4fe3e1f86442bb55 (patch) | |
| tree | fd600fd57fc9f270b9bf8bcb840ed06f289d40c9 /source/blender/depsgraph | |
| parent | 4a3067410250eeae578b87a5d4f629fa1455bc43 (diff) | |
Depsgraph: Use operation code for armature evaluation
Diffstat (limited to 'source/blender/depsgraph')
4 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 01ce2f82335..2c213c7ec80 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -1415,8 +1415,7 @@ void DepsgraphNodeBuilder::build_armature(bArmature *armature) add_operation_node(&armature->id, NodeType::PARAMETERS, NULL, - OperationCode::PLACEHOLDER, - "Armature Eval"); + OperationCode::ARMATURE_EVAL); } void DepsgraphNodeBuilder::build_camera(Camera *camera) diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc index ec8a24707ab..1b0057d78fd 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc @@ -343,8 +343,7 @@ void DepsgraphRelationBuilder::build_rig(Object *object) build_armature(armature); OperationKey armature_key(&armature->id, NodeType::PARAMETERS, - OperationCode::PLACEHOLDER, - "Armature Eval"); + OperationCode::ARMATURE_EVAL); add_relation(armature_key, pose_init_key, "Data dependency"); /* IK Solvers. * diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.cc b/source/blender/depsgraph/intern/node/deg_node_operation.cc index cf4671bf72b..b222253f555 100644 --- a/source/blender/depsgraph/intern/node/deg_node_operation.cc +++ b/source/blender/depsgraph/intern/node/deg_node_operation.cc @@ -71,6 +71,7 @@ const char *operationCodeAsString(OperationCode opcode) /* Object data. */ case OperationCode::LIGHT_PROBE_EVAL: return "LIGHT_PROBE_EVAL"; case OperationCode::SPEAKER_EVAL: return "SPEAKER_EVAL"; + case OperationCode::ARMATURE_EVAL: return "ARMATURE_EVAL"; /* Pose. */ case OperationCode::POSE_INIT: return "POSE_INIT"; case OperationCode::POSE_INIT_IK: return "POSE_INIT_IK"; diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.h b/source/blender/depsgraph/intern/node/deg_node_operation.h index 7a6df7cf161..545290d9399 100644 --- a/source/blender/depsgraph/intern/node/deg_node_operation.h +++ b/source/blender/depsgraph/intern/node/deg_node_operation.h @@ -98,6 +98,7 @@ enum class OperationCode { /* Object data. --------------------------------------------------------- */ LIGHT_PROBE_EVAL, SPEAKER_EVAL, + ARMATURE_EVAL, /* Pose. ---------------------------------------------------------------- */ /* Init pose, clear flags, etc. */ |