From a2e22c79cbb1d02f5e00205721b54c80c261adbb Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 25 Oct 2017 11:34:41 +0200 Subject: Depsgraph: Cleanup, use explicit cloth modifier opcode Avoids use of placeholder operation which also was involving some string comparisons. --- source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 3 +-- source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 3 +-- source/blender/depsgraph/intern/depsgraph_type_defines.cc | 1 + source/blender/depsgraph/intern/depsgraph_types.h | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/depsgraph') diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index a1326e97afa..485cb19d7ee 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -707,8 +707,7 @@ void DepsgraphNodeBuilder::build_cloth(Scene *scene, Object *object) _1, scene, object), - DEG_OPCODE_PLACEHOLDER, - "Cloth Modifier"); + DEG_OPCODE_GEOMETRY_CLOTH_MODIFIER); } /* Shapekeys */ diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index f0f4cf3dc29..ebfd5d404db 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -1419,8 +1419,7 @@ void DepsgraphRelationBuilder::build_cloth(Scene * /*scene*/, { OperationKey cache_key(&object->id, DEG_NODE_TYPE_CACHE, - DEG_OPCODE_PLACEHOLDER, - "Cloth Modifier"); + DEG_OPCODE_GEOMETRY_CLOTH_MODIFIER); /* Cache component affects on modifier. */ OperationKey modifier_key(&object->id, DEG_NODE_TYPE_GEOMETRY, diff --git a/source/blender/depsgraph/intern/depsgraph_type_defines.cc b/source/blender/depsgraph/intern/depsgraph_type_defines.cc index 18074652f2d..29636ed9ae9 100644 --- a/source/blender/depsgraph/intern/depsgraph_type_defines.cc +++ b/source/blender/depsgraph/intern/depsgraph_type_defines.cc @@ -117,6 +117,7 @@ static const char *stringify_opcode(eDepsOperation_Code opcode) STRINGIFY_OPCODE(RIGIDBODY_TRANSFORM_COPY); /* Geometry. */ STRINGIFY_OPCODE(GEOMETRY_UBEREVAL); + STRINGIFY_OPCODE(GEOMETRY_CLOTH_MODIFIER); /* 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 c6a44902a86..26f374f316c 100644 --- a/source/blender/depsgraph/intern/depsgraph_types.h +++ b/source/blender/depsgraph/intern/depsgraph_types.h @@ -167,6 +167,7 @@ typedef enum eDepsOperation_Code { /* Geometry. ---------------------------------------- */ /* Evaluate the whole geometry, including modifiers. */ DEG_OPCODE_GEOMETRY_UBEREVAL, + DEG_OPCODE_GEOMETRY_CLOTH_MODIFIER, /* Pose. -------------------------------------------- */ /* Init pose, clear flags, etc. */ -- cgit v1.2.3