Depsgraph: Use explicit opcode for shape key
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 25 Oct 2017 09:37:24 +0000 (11:37 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 25 Oct 2017 09:37:24 +0000 (11:37 +0200)
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/depsgraph_type_defines.cc
source/blender/depsgraph/intern/depsgraph_types.h

index 485cb19d7ee2ae1fc678660be8edd6c77609675e..77f4e5b2dd125021dab32ccc0df0442f1e1779ca 100644 (file)
@@ -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 */
index 29636ed9ae908a285674ab3b96e8378b925ac52b..96d68f4e024c38d4cf59ff4bbee3b8b561662772 100644 (file)
@@ -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);
index 26f374f316c2aaf6e5d066b24d575800f4acca33..e43b79a0361cb0837c66bf5f76918f2232cf20f0 100644 (file)
@@ -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. */