diff options
4 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 45e4a5eb69b..2f22d4b2087 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -1258,7 +1258,7 @@ void DepsgraphNodeBuilder::build_object_data_geometry( _1, scene_cow, object_cow), - OperationCode::GEOMETRY_UBEREVAL); + OperationCode::GEOMETRY_EVAL); op_node->set_as_exit(); op_node = add_operation_node(&object->id, diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 1fdae02d23a..65b235dac1f 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -1695,7 +1695,7 @@ void DepsgraphRelationBuilder::build_particle_systems(Object *object) TimeSourceKey time_src_key; OperationKey obdata_ubereval_key(&object->id, NodeType::GEOMETRY, - OperationCode::GEOMETRY_UBEREVAL); + OperationCode::GEOMETRY_EVAL); OperationKey eval_init_key(&object->id, NodeType::PARTICLE_SYSTEM, OperationCode::PARTICLE_SYSTEM_INIT); @@ -1888,7 +1888,7 @@ void DepsgraphRelationBuilder::build_particle_system_visualization_object( psys->name); OperationKey obdata_ubereval_key(&object->id, NodeType::GEOMETRY, - OperationCode::GEOMETRY_UBEREVAL); + OperationCode::GEOMETRY_EVAL); ComponentKey dup_ob_key(&draw_object->id, NodeType::TRANSFORM); add_relation(dup_ob_key, psys_key, "Particle Object Visualization"); if (draw_object->type == OB_MBALL) { @@ -1954,7 +1954,7 @@ void DepsgraphRelationBuilder::build_object_data_geometry(Object *object) add_relation(obdata_geom_key, geom_key, "Object Geometry Base Data"); OperationKey obdata_ubereval_key(&object->id, NodeType::GEOMETRY, - OperationCode::GEOMETRY_UBEREVAL); + OperationCode::GEOMETRY_EVAL); /* Special case: modifiers evaluation queries scene for various things like * data mask to be used. We add relation here to ensure object is never * evaluated prior to Scene's CoW is ready. */ @@ -2047,7 +2047,7 @@ void DepsgraphRelationBuilder::build_object_data_geometry(Object *object) /* Armatures does no longer require uber node. */ OperationKey obdata_ubereval_key(&object->id, NodeType::GEOMETRY, - OperationCode::GEOMETRY_UBEREVAL); + OperationCode::GEOMETRY_EVAL); add_relation(geom_init_key, obdata_ubereval_key, "Object Geometry UberEval"); @@ -2087,7 +2087,7 @@ void DepsgraphRelationBuilder::build_object_data_geometry(Object *object) TimeSourceKey time_key; OperationKey obdata_ubereval_key(&object->id, NodeType::GEOMETRY, - OperationCode::GEOMETRY_UBEREVAL); + OperationCode::GEOMETRY_EVAL); add_relation(time_key, obdata_ubereval_key, "Legacy particle time"); } /* Object data datablock. */ diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.cc b/source/blender/depsgraph/intern/node/deg_node_operation.cc index 8d6f9e067c5..68a359a09ed 100644 --- a/source/blender/depsgraph/intern/node/deg_node_operation.cc +++ b/source/blender/depsgraph/intern/node/deg_node_operation.cc @@ -64,7 +64,7 @@ const char *operationCodeAsString(OperationCode opcode) case OperationCode::RIGIDBODY_TRANSFORM_COPY: return "RIGIDBODY_TRANSFORM_COPY"; /* Geometry. */ - case OperationCode::GEOMETRY_UBEREVAL: return "GEOMETRY_UBEREVAL"; + case OperationCode::GEOMETRY_EVAL: return "GEOMETRY_EVAL"; case OperationCode::GEOMETRY_SHAPEKEY: return "GEOMETRY_SHAPEKEY"; /* Object data. */ case OperationCode::LIGHT_PROBE_EVAL: return "LIGHT_PROBE_EVAL"; diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.h b/source/blender/depsgraph/intern/node/deg_node_operation.h index c600f10166b..480b33fad83 100644 --- a/source/blender/depsgraph/intern/node/deg_node_operation.h +++ b/source/blender/depsgraph/intern/node/deg_node_operation.h @@ -85,7 +85,7 @@ enum class OperationCode { /* Geometry. ------------------------------------------------------------ */ /* Evaluate the whole geometry, including modifiers. */ - GEOMETRY_UBEREVAL, + GEOMETRY_EVAL, /* Evaluation of a shape key. */ GEOMETRY_SHAPEKEY, |