diff options
| author | Campbell Barton <campbell@blender.org> | 2022-05-11 05:59:58 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-05-11 06:38:00 +0300 |
| commit | 42e275a7d4fff6464024d99a78f69f1cb490d930 (patch) | |
| tree | bd9d93ae6b947acd5d7c84150e954266cf50a9c3 /source/blender/blenkernel/intern/curve_catmull_rom.cc | |
| parent | 8f1a11c35ace98c9fd0ee6db131a02852660ed25 (diff) | |
Cleanup: use '_num' suffix, mostly for curves & spline code
Replace tot/amount & size with num, in keeping with T85728.
Diffstat (limited to 'source/blender/blenkernel/intern/curve_catmull_rom.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/curve_catmull_rom.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/curve_catmull_rom.cc b/source/blender/blenkernel/intern/curve_catmull_rom.cc index 2db183eea3e..4b2174c912c 100644 --- a/source/blender/blenkernel/intern/curve_catmull_rom.cc +++ b/source/blender/blenkernel/intern/curve_catmull_rom.cc @@ -9,11 +9,11 @@ namespace blender::bke::curves::catmull_rom { -int calculate_evaluated_size(const int points_num, const bool cyclic, const int resolution) +int calculate_evaluated_num(const int points_num, const bool cyclic, const int resolution) { - const int eval_size = resolution * curve_segment_size(points_num, cyclic); + const int eval_num = resolution * curve_segment_num(points_num, cyclic); /* If the curve isn't cyclic, one last point is added to the final point. */ - return cyclic ? eval_size : eval_size + 1; + return cyclic ? eval_num : eval_num + 1; } /* Adapted from Cycles #catmull_rom_basis_eval function. */ @@ -46,7 +46,7 @@ static void interpolate_to_evaluated(const Span<T> src, MutableSpan<T> dst) { - BLI_assert(dst.size() == calculate_evaluated_size(src.size(), cyclic, resolution)); + BLI_assert(dst.size() == calculate_evaluated_num(src.size(), cyclic, resolution)); /* - First deal with one and two point curves need special attention. * - Then evaluate the first and last segment(s) whose control points need to wrap around |