Cleanup: Rename spline interpolation functions

The names were slightly longer than they needed to be clear,
and when they are shorter they tend to fit on one line better.

1 files changed, 19 insertions, 20 deletions

diff --git a/source/blender/blenkernel/BKE_spline.hh b/source/blender/blenkernel/BKE_spline.hh
index f4a27c91e67..b5d06da4651 100644
--- a/source/blender/blenkernel/BKE_spline.hh
+++ b/source/blender/blenkernel/BKE_spline.hh
@@ -49,7 +49,7 @@ using SplinePtr = std::unique_ptr<Spline>;
  * evaluation happens in a layer on top of the evaluated points generated by the derived types.
  *
  * There are a few methods to evaluate a spline:
- *  1. #evaluated_positions and #interpolate_to_evaluated_points give data for the initial
+ *  1. #evaluated_positions and #interpolate_to_evaluated give data for the initial
  *     evaluated points, depending on the resolution.
  *  2. #lookup_evaluated_factor and #lookup_evaluated_factor are meant for one-off lookups
  *     along the length of a curve.
@@ -171,23 +171,23 @@ class Spline {
   blender::Array<float> sample_uniform_index_factors(const int samples_size) const;
   LookupResult lookup_data_from_index_factor(const float index_factor) const;
 
-  void sample_based_on_index_factors(const blender::fn::GVArray &src,
-                                     blender::Span<float> index_factors,
-                                     blender::fn::GMutableSpan dst) const;
+  void sample_with_index_factors(const blender::fn::GVArray &src,
+                                 blender::Span<float> index_factors,
+                                 blender::fn::GMutableSpan dst) const;
   template<typename T>
-  void sample_based_on_index_factors(const blender::VArray<T> &src,
-                                     blender::Span<float> index_factors,
-                                     blender::MutableSpan<T> dst) const
+  void sample_with_index_factors(const blender::VArray<T> &src,
+                                 blender::Span<float> index_factors,
+                                 blender::MutableSpan<T> dst) const
   {
-    this->sample_based_on_index_factors(
+    this->sample_with_index_factors(
         blender::fn::GVArray_For_VArray(src), index_factors, blender::fn::GMutableSpan(dst));
   }
   template<typename T>
-  void sample_based_on_index_factors(blender::Span<T> src,
-                                     blender::Span<float> index_factors,
-                                     blender::MutableSpan<T> dst) const
+  void sample_with_index_factors(blender::Span<T> src,
+                                 blender::Span<float> index_factors,
+                                 blender::MutableSpan<T> dst) const
   {
-    this->sample_based_on_index_factors(blender::VArray_For_Span(src), index_factors, dst);
+    this->sample_with_index_factors(blender::VArray_For_Span(src), index_factors, dst);
   }
 
   /**
@@ -195,14 +195,13 @@ class Spline {
    * evaluated points. For poly splines, the lifetime of the returned virtual array must not
    * exceed the lifetime of the input data.
    */
-  virtual blender::fn::GVArrayPtr interpolate_to_evaluated_points(
+  virtual blender::fn::GVArrayPtr interpolate_to_evaluated(
       const blender::fn::GVArray &source_data) const = 0;
-  blender::fn::GVArrayPtr interpolate_to_evaluated_points(blender::fn::GSpan data) const;
+  blender::fn::GVArrayPtr interpolate_to_evaluated(blender::fn::GSpan data) const;
   template<typename T>
-  blender::fn::GVArray_Typed<T> interpolate_to_evaluated_points(blender::Span<T> data) const
+  blender::fn::GVArray_Typed<T> interpolate_to_evaluated(blender::Span<T> data) const
   {
-    return blender::fn::GVArray_Typed<T>(
-        this->interpolate_to_evaluated_points(blender::fn::GSpan(data)));
+    return blender::fn::GVArray_Typed<T>(this->interpolate_to_evaluated(blender::fn::GSpan(data)));
   }
 
  protected:
@@ -333,7 +332,7 @@ class BezierSpline final : public Spline {
   };
   InterpolationData interpolation_data_from_index_factor(const float index_factor) const;
 
-  virtual blender::fn::GVArrayPtr interpolate_to_evaluated_points(
+  virtual blender::fn::GVArrayPtr interpolate_to_evaluated(
       const blender::fn::GVArray &source_data) const override;
 
   void evaluate_segment(const int index,
@@ -456,7 +455,7 @@ class NURBSpline final : public Spline {
 
   blender::Span<blender::float3> evaluated_positions() const final;
 
-  blender::fn::GVArrayPtr interpolate_to_evaluated_points(
+  blender::fn::GVArrayPtr interpolate_to_evaluated(
       const blender::fn::GVArray &source_data) const final;
 
  protected:
@@ -506,7 +505,7 @@ class PolySpline final : public Spline {
 
   blender::Span<blender::float3> evaluated_positions() const final;
 
-  blender::fn::GVArrayPtr interpolate_to_evaluated_points(
+  blender::fn::GVArrayPtr interpolate_to_evaluated(
       const blender::fn::GVArray &source_data) const final;
 
  protected: