blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Cleanup: Rename geometry set "curve" to "curves" 

Similar to 245722866d, just another function I missed before.
This commit is contained in:
Hans Goudey 2022-03-07 16:26:55 -06:00
parent dfd7832a0e
commit b8f1ae5c38
15 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/BKE_geometry_set.hh
View File

@ -500,8 +500,8 @@ struct GeometrySet {
/**
* Clear the existing curves data-block and replace it with the given one.
*/
void replace_curve(Curves *curves,
GeometryOwnershipType ownership = GeometryOwnershipType::Owned);
void replace_curves(Curves *curves,
GeometryOwnershipType ownership = GeometryOwnershipType::Owned);
private:
/**

2
source/blender/blenkernel/intern/displist.cc
View File

@ -865,7 +865,7 @@ static GeometrySet curve_calc_modifiers_post(Depsgraph *depsgraph,
else {
std::unique_ptr<CurveEval> curve_eval = curve_eval_from_dna_curve(
*cu, ob->runtime.curve_cache->deformed_nurbs);
geometry_set.replace_curve(curve_eval_to_curves(*curve_eval));
geometry_set.replace_curves(curve_eval_to_curves(*curve_eval));
}
for (; md; md = md->next) {

2
source/blender/blenkernel/intern/geometry_set.cc
View File

@ -353,7 +353,7 @@ void GeometrySet::replace_mesh(Mesh *mesh, GeometryOwnershipType ownership)
component.replace(mesh, ownership);
}
void GeometrySet::replace_curve(Curves *curves, GeometryOwnershipType ownership)
void GeometrySet::replace_curves(Curves *curves, GeometryOwnershipType ownership)
{
if (curves == nullptr) {
this->remove<CurveComponent>();

2
source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_reverse.cc
View File

@ -41,7 +41,7 @@ static void node_geo_exec(GeoNodeExecParams params)
}
});
geometry_set.replace_curve(curve_eval_to_curves(*curve));
geometry_set.replace_curves(curve_eval_to_curves(*curve));
params.set_output("Curve", geometry_set);
}

2
source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_set_handles.cc
View File

@ -101,7 +101,7 @@ static void node_geo_exec(GeoNodeExecParams params)
bezier_spline.mark_cache_invalid();
}
geometry_set.replace_curve(curve_eval_to_curves(*curve));
geometry_set.replace_curves(curve_eval_to_curves(*curve));
if (!has_bezier_spline) {
params.error_message_add(NodeWarningType::Info, TIP_("No Bezier splines in input curve"));

4
source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc
View File

@ -120,7 +120,7 @@ static void curve_fill_calculate(GeometrySet &geometry_set, const GeometryNodeCu
const std::unique_ptr<CurveEval> curve = curves_to_curve_eval(
*geometry_set.get_curves_for_read());
if (curve->splines().is_empty()) {
geometry_set.replace_curve(nullptr);
geometry_set.replace_curves(nullptr);
return;
}
@ -132,7 +132,7 @@ static void curve_fill_calculate(GeometrySet &geometry_set, const GeometryNodeCu
Mesh *mesh = cdt_to_mesh(results);
geometry_set.replace_mesh(mesh);
geometry_set.replace_curve(nullptr);
geometry_set.replace_curves(nullptr);
}
static void node_geo_exec(GeoNodeExecParams params)

2
source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc
View File

@ -606,7 +606,7 @@ static void calculate_curve_fillet(GeometrySet &geometry_set,
const std::unique_ptr<CurveEval> input_curve = curves_to_curve_eval(*component.get_for_read());
std::unique_ptr<CurveEval> output_curve = fillet_curve(*input_curve, fillet_param);
geometry_set.replace_curve(curve_eval_to_curves(*output_curve));
geometry_set.replace_curves(curve_eval_to_curves(*output_curve));
}
static void node_geo_exec(GeoNodeExecParams params)

2
source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc
View File

@ -242,7 +242,7 @@ static void geometry_set_curve_resample(GeometrySet &geometry_set,
std::unique_ptr<CurveEval> output_curve = resample_curve(
geometry_set.get_component_for_read<CurveComponent>(), mode_param);
geometry_set.replace_curve(curve_eval_to_curves(*output_curve));
geometry_set.replace_curves(curve_eval_to_curves(*output_curve));
}
static void node_geo_exec(GeoNodeExecParams params)

2
source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc
View File

@ -403,7 +403,7 @@ static void node_geo_exec(GeoNodeExecParams params)
}
});
new_curve->attributes = curve->attributes;
geometry_set.replace_curve(curve_eval_to_curves(*new_curve));
geometry_set.replace_curves(curve_eval_to_curves(*new_curve));
});
params.set_output("Curve", std::move(geometry_set));

2
source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc
View File

@ -342,7 +342,7 @@ static void node_geo_exec(GeoNodeExecParams params)
}
std::unique_ptr<CurveEval> output_curve = subdivide_curve(
*curves_to_curve_eval(*component.get_for_read()), cuts);
geometry_set.replace_curve(curve_eval_to_curves(*output_curve));
geometry_set.replace_curves(curve_eval_to_curves(*output_curve));
});
params.set_output("Curve", geometry_set);
}

2
source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc
View File

@ -566,7 +566,7 @@ static void geometry_set_curve_trim(GeometrySet &geometry_set,
}
});
geometry_set.replace_curve(curve_eval_to_curves(*curve));
geometry_set.replace_curves(curve_eval_to_curves(*curve));
}
static void node_geo_exec(GeoNodeExecParams params)

4
source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc
View File

@ -477,10 +477,10 @@ static void separate_curve_selection(GeometrySet &geometry_set,
std::unique_ptr<CurveEval> r_curve = curve_separate(
*curves_to_curve_eval(*src_component.get_for_read()), selection, selection_domain, invert);
if (r_curve) {
geometry_set.replace_curve(curve_eval_to_curves(*r_curve));
geometry_set.replace_curves(curve_eval_to_curves(*r_curve));
}
else {
geometry_set.replace_curve(nullptr);
geometry_set.replace_curves(nullptr);
}
}

2
source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc
View File

@ -599,7 +599,7 @@ static void duplicate_splines(GeometrySet &geometry_set,
dst_component, ATTR_DOMAIN_CURVE, selection, attributes, curve_offsets);
}
geometry_set.replace_curve(dst_component.get_for_write());
geometry_set.replace_curves(dst_component.get_for_write());
}
static void duplicate_faces(GeometrySet &geometry_set,

2
source/blender/nodes/geometry/nodes/node_geo_mesh_to_curve.cc
View File

@ -35,7 +35,7 @@ static void node_geo_exec(GeoNodeExecParams params)
}
std::unique_ptr<CurveEval> curve = geometry::mesh_to_curve_convert(component, selection);
geometry_set.replace_curve(curve_eval_to_curves(*curve));
geometry_set.replace_curves(curve_eval_to_curves(*curve));
geometry_set.keep_only({GEO_COMPONENT_TYPE_CURVE, GEO_COMPONENT_TYPE_INSTANCES});
});

4
source/blender/nodes/geometry/nodes/node_geo_transform.cc
View File

@ -129,7 +129,7 @@ static void translate_geometry_set(GeometrySet &geometry,
if (Curves *curves = geometry.get_curves_for_write()) {
std::unique_ptr<CurveEval> curve = curves_to_curve_eval(*curves);
curve->translate(translation);
geometry.replace_curve(curve_eval_to_curves(*curve));
geometry.replace_curves(curve_eval_to_curves(*curve));
}
if (Mesh *mesh = geometry.get_mesh_for_write()) {
translate_mesh(*mesh, translation);
@ -152,7 +152,7 @@ void transform_geometry_set(GeometrySet &geometry,
if (Curves *curves = geometry.get_curves_for_write()) {
std::unique_ptr<CurveEval> curve = curves_to_curve_eval(*curves);
curve->transform(transform);
geometry.replace_curve(curve_eval_to_curves(*curve));
geometry.replace_curves(curve_eval_to_curves(*curve));
}
if (Mesh *mesh = geometry.get_mesh_for_write()) {
transform_mesh(*mesh, transform);