diff options
author | Hans Goudey <h.goudey@me.com> | 2022-03-08 01:26:55 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-03-08 01:26:55 +0300 |
commit | b8f1ae5c388608e0e47dbc84f75a01453f2013ef (patch) | |
tree | fe7e2c0a6902abc873000cf2d44709716b4840ca | |
parent | dfd7832a0e111fe6733de95693338ac7702989c4 (diff) |
Cleanup: Rename geometry set "curve" to "curves"
Similar to 245722866d6977c8b, just another function I missed before.
15 files changed, 19 insertions, 19 deletions
diff --git a/source/blender/blenkernel/BKE_geometry_set.hh b/source/blender/blenkernel/BKE_geometry_set.hh index f7767cc2a60..169554b4453 100644 --- a/source/blender/blenkernel/BKE_geometry_set.hh +++ b/source/blender/blenkernel/BKE_geometry_set.hh @@ -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: /** diff --git a/source/blender/blenkernel/intern/displist.cc b/source/blender/blenkernel/intern/displist.cc index f0894ee04e2..791e0faab3b 100644 --- a/source/blender/blenkernel/intern/displist.cc +++ b/source/blender/blenkernel/intern/displist.cc @@ -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) { diff --git a/source/blender/blenkernel/intern/geometry_set.cc b/source/blender/blenkernel/intern/geometry_set.cc index ca372ba8f38..0eece6e9ad0 100644 --- a/source/blender/blenkernel/intern/geometry_set.cc +++ b/source/blender/blenkernel/intern/geometry_set.cc @@ -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>(); diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_reverse.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_reverse.cc index 2fe06a17adf..2c801642bd7 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_reverse.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_reverse.cc @@ -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); } diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_set_handles.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_set_handles.cc index 537c7c42610..56e9068882b 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_set_handles.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_set_handles.cc @@ -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")); diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc index 6702ee6c0aa..08aa7415073 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc @@ -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) diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc index 24d72ad553b..0b01efc4e9e 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc @@ -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) diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc index c5814a9a1dd..5a4c2ad1660 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc @@ -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) diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc index 55610ec86ab..92c0cafa551 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc @@ -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)); diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc index bbe57b2b3fa..6456af5f295 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc @@ -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); } diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc index a3dab1b50fe..df360818313 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc @@ -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) diff --git a/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc b/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc index 3baee8a25bb..cf6837817c2 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc @@ -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); } } diff --git a/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc b/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc index 1ceab18c01b..eb216c08289 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc @@ -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, diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_curve.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_curve.cc index 91cde52f9eb..d2b824141d7 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_curve.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_curve.cc @@ -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}); }); diff --git a/source/blender/nodes/geometry/nodes/node_geo_transform.cc b/source/blender/nodes/geometry/nodes/node_geo_transform.cc index 95cec8eab11..9159ac081e0 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_transform.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_transform.cc @@ -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); |