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 /source/blender/blenkernel | |
parent | dfd7832a0e111fe6733de95693338ac7702989c4 (diff) |
Cleanup: Rename geometry set "curve" to "curves"
Similar to 245722866d6977c8b, just another function I missed before.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_geometry_set.hh | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/displist.cc | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/geometry_set.cc | 2 |
3 files changed, 4 insertions, 4 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>(); |