diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-25 12:37:24 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-25 12:37:24 +0300 |
| commit | eb090d06092701683d073fa041e64077b61b810c (patch) | |
| tree | c83efadfd2988bccde0d61de79fa070cb0e5aa17 /source/blender | |
| parent | a2e22c79cbb1d02f5e00205721b54c80c261adbb (diff) | |
Depsgraph: Use explicit opcode for shape key
Diffstat (limited to 'source/blender')
3 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 485cb19d7ee..77f4e5b2dd1 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -714,9 +714,10 @@ void DepsgraphNodeBuilder::build_cloth(Scene *scene, Object *object) void DepsgraphNodeBuilder::build_shapekeys(Key *key) { build_animdata(&key->id); - - add_operation_node(&key->id, DEG_NODE_TYPE_GEOMETRY, NULL, - DEG_OPCODE_PLACEHOLDER, "Shapekey Eval"); + add_operation_node(&key->id, + DEG_NODE_TYPE_GEOMETRY, + NULL, + DEG_OPCODE_GEOMETRY_SHAPEKEY); } /* ObData Geometry Evaluation */ diff --git a/source/blender/depsgraph/intern/depsgraph_type_defines.cc b/source/blender/depsgraph/intern/depsgraph_type_defines.cc index 29636ed9ae9..96d68f4e024 100644 --- a/source/blender/depsgraph/intern/depsgraph_type_defines.cc +++ b/source/blender/depsgraph/intern/depsgraph_type_defines.cc @@ -118,6 +118,7 @@ static const char *stringify_opcode(eDepsOperation_Code opcode) /* Geometry. */ STRINGIFY_OPCODE(GEOMETRY_UBEREVAL); STRINGIFY_OPCODE(GEOMETRY_CLOTH_MODIFIER); + STRINGIFY_OPCODE(GEOMETRY_SHAPEKEY); /* Pose. */ STRINGIFY_OPCODE(POSE_INIT); STRINGIFY_OPCODE(POSE_INIT_IK); diff --git a/source/blender/depsgraph/intern/depsgraph_types.h b/source/blender/depsgraph/intern/depsgraph_types.h index 26f374f316c..e43b79a0361 100644 --- a/source/blender/depsgraph/intern/depsgraph_types.h +++ b/source/blender/depsgraph/intern/depsgraph_types.h @@ -168,6 +168,7 @@ typedef enum eDepsOperation_Code { /* Evaluate the whole geometry, including modifiers. */ DEG_OPCODE_GEOMETRY_UBEREVAL, DEG_OPCODE_GEOMETRY_CLOTH_MODIFIER, + DEG_OPCODE_GEOMETRY_SHAPEKEY, /* Pose. -------------------------------------------- */ /* Init pose, clear flags, etc. */ |