diff options
| author | Jacques Lucke <jacques@blender.org> | 2022-03-19 10:26:29 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2022-03-19 10:26:29 +0300 |
| commit | 3e16f3b3ef4b8f385b30fe4a1e00860620f610ee (patch) | |
| tree | cea8e2a3ea8a8a7dbce98263d166b4782d83721b /source/blender/blenkernel/BKE_curves.hh | |
| parent | c655146b87fe20853e52b87991b46732a04d749e (diff) | |
BLI: move generic data structures to blenlib
This is a follow up to rB2252bc6a5527cd7360d1ccfe7a2d1bc640a8dfa6.
Diffstat (limited to 'source/blender/blenkernel/BKE_curves.hh')
| -rw-r--r-- | source/blender/blenkernel/BKE_curves.hh | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/source/blender/blenkernel/BKE_curves.hh b/source/blender/blenkernel/BKE_curves.hh index 93b98a01fce..ea378c5a0a5 100644 --- a/source/blender/blenkernel/BKE_curves.hh +++ b/source/blender/blenkernel/BKE_curves.hh @@ -12,6 +12,7 @@ #include <mutex> #include "BLI_float4x4.hh" +#include "BLI_generic_virtual_array.hh" #include "BLI_index_mask.hh" #include "BLI_math_vec_types.hh" #include "BLI_span.hh" @@ -21,8 +22,6 @@ #include "BKE_attribute_access.hh" -#include "FN_generic_virtual_array.hh" - namespace blender::bke { template<typename T, BLI_ENABLE_IF(std::is_integral_v<T>)> @@ -287,9 +286,7 @@ class CurvesGeometry : public ::CurvesGeometry { * Attributes. */ - fn::GVArray adapt_domain(const fn::GVArray &varray, - AttributeDomain from, - AttributeDomain to) const; + GVArray adapt_domain(const GVArray &varray, AttributeDomain from, AttributeDomain to) const; }; namespace curves { @@ -375,7 +372,7 @@ int calculate_evaluated_size(int size, bool cyclic, int resolution); * Evaluate the Catmull Rom curve. The length of the #dst span should be calculated with * #calculate_evaluated_size and is expected to divide evenly by the #src span's segment size. */ -void interpolate_to_evaluated(fn::GSpan src, bool cyclic, int resolution, fn::GMutableSpan dst); +void interpolate_to_evaluated(GSpan src, bool cyclic, int resolution, GMutableSpan dst); } // namespace catmull_rom @@ -439,8 +436,8 @@ void calculate_basis_cache(int size, void interpolate_to_evaluated(const BasisCache &basis_cache, int8_t order, Span<float> control_weights, - fn::GSpan src, - fn::GMutableSpan dst); + GSpan src, + GMutableSpan dst); } // namespace nurbs |