archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Depsgraph: Cleanup, use explicit cloth modifier opcode

Browse Source 
Avoids use of placeholder operation which also was involving some string
comparisons.
This commit is contained in:
Sergey Sharybin
2017-10-25 11:34:41 +02:00
parent 3997a157e9
commit a2e22c79cb
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
View File

@@ -707,8 +707,7 @@ void DepsgraphNodeBuilder::build_cloth(Scene *scene, Object *object)
_1, _1,
scene, scene,
object), object),
DEG_OPCODE_PLACEHOLDER, DEG_OPCODE_GEOMETRY_CLOTH_MODIFIER);
"Cloth Modifier");
} }
/* Shapekeys */ /* Shapekeys */

3
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
View File

@@ -1419,8 +1419,7 @@ void DepsgraphRelationBuilder::build_cloth(Scene * /*scene*/,
{ {
OperationKey cache_key(&object->id, OperationKey cache_key(&object->id,
DEG_NODE_TYPE_CACHE, DEG_NODE_TYPE_CACHE,
DEG_OPCODE_PLACEHOLDER, DEG_OPCODE_GEOMETRY_CLOTH_MODIFIER);
"Cloth Modifier");
/* Cache component affects on modifier. */ /* Cache component affects on modifier. */
OperationKey modifier_key(&object->id, OperationKey modifier_key(&object->id,
DEG_NODE_TYPE_GEOMETRY, DEG_NODE_TYPE_GEOMETRY,

1
source/blender/depsgraph/intern/depsgraph_type_defines.cc
View File

@@ -117,6 +117,7 @@ static const char *stringify_opcode(eDepsOperation_Code opcode)
STRINGIFY_OPCODE(RIGIDBODY_TRANSFORM_COPY); STRINGIFY_OPCODE(RIGIDBODY_TRANSFORM_COPY);
/* Geometry. */ /* Geometry. */
STRINGIFY_OPCODE(GEOMETRY_UBEREVAL); STRINGIFY_OPCODE(GEOMETRY_UBEREVAL);
STRINGIFY_OPCODE(GEOMETRY_CLOTH_MODIFIER);
/* Pose. */ /* Pose. */
STRINGIFY_OPCODE(POSE_INIT); STRINGIFY_OPCODE(POSE_INIT);
STRINGIFY_OPCODE(POSE_INIT_IK); STRINGIFY_OPCODE(POSE_INIT_IK);

1
source/blender/depsgraph/intern/depsgraph_types.h
View File

@@ -167,6 +167,7 @@ typedef enum eDepsOperation_Code {
/* Geometry. ---------------------------------------- */ /* Geometry. ---------------------------------------- */
/* Evaluate the whole geometry, including modifiers. */ /* Evaluate the whole geometry, including modifiers. */
DEG_OPCODE_GEOMETRY_UBEREVAL, DEG_OPCODE_GEOMETRY_UBEREVAL,
DEG_OPCODE_GEOMETRY_CLOTH_MODIFIER,
/* Pose. -------------------------------------------- */ /* Pose. -------------------------------------------- */
/* Init pose, clear flags, etc. */ /* Init pose, clear flags, etc. */