Merge branch 'master' into blender2.8
[blender.git] / source / blender / depsgraph / intern / depsgraph_type_defines.cc
index 8e07caf3e0ec88d6ba375dfcd5462f0d700178d3..612944dab6e7da5d51b4e326f089554a30bd806d 100644 (file)
@@ -97,23 +97,17 @@ static const char *stringify_opcode(eDepsOperation_Code opcode)
 #define STRINGIFY_OPCODE(name) case DEG_OPCODE_##name: return #name
                STRINGIFY_OPCODE(OPERATION);
                STRINGIFY_OPCODE(PLACEHOLDER);
-               STRINGIFY_OPCODE(NOOP);
                STRINGIFY_OPCODE(ANIMATION);
                STRINGIFY_OPCODE(DRIVER);
-               //STRINGIFY_OPCODE(PROXY);
                STRINGIFY_OPCODE(TRANSFORM_LOCAL);
                STRINGIFY_OPCODE(TRANSFORM_PARENT);
                STRINGIFY_OPCODE(TRANSFORM_CONSTRAINTS);
-               //STRINGIFY_OPCODE(TRANSFORM_CONSTRAINTS_INIT);
-               //STRINGIFY_OPCODE(TRANSFORM_CONSTRAINT);
-               //STRINGIFY_OPCODE(TRANSFORM_CONSTRAINTS_DONE);
                STRINGIFY_OPCODE(RIGIDBODY_REBUILD);
                STRINGIFY_OPCODE(RIGIDBODY_SIM);
                STRINGIFY_OPCODE(TRANSFORM_RIGIDBODY);
                STRINGIFY_OPCODE(TRANSFORM_FINAL);
                STRINGIFY_OPCODE(OBJECT_UBEREVAL);
                STRINGIFY_OPCODE(GEOMETRY_UBEREVAL);
-               STRINGIFY_OPCODE(GEOMETRY_MODIFIER);
                STRINGIFY_OPCODE(GEOMETRY_PATH);
                STRINGIFY_OPCODE(POSE_INIT);
                STRINGIFY_OPCODE(POSE_DONE);
@@ -122,9 +116,6 @@ static const char *stringify_opcode(eDepsOperation_Code opcode)
                STRINGIFY_OPCODE(BONE_LOCAL);
                STRINGIFY_OPCODE(BONE_POSE_PARENT);
                STRINGIFY_OPCODE(BONE_CONSTRAINTS);
-               //STRINGIFY_OPCODE(BONE_CONSTRAINTS_INIT);
-               //STRINGIFY_OPCODE(BONE_CONSTRAINT);
-               //STRINGIFY_OPCODE(BONE_CONSTRAINTS_DONE);
                STRINGIFY_OPCODE(BONE_READY);
                STRINGIFY_OPCODE(BONE_DONE);
                STRINGIFY_OPCODE(PSYS_EVAL);