diff options
| -rw-r--r-- | source/blender/blenkernel/BKE_spline.hh | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/source/blender/blenkernel/BKE_spline.hh b/source/blender/blenkernel/BKE_spline.hh index 5ff6fc4a5b4..48b5dfb1623 100644 --- a/source/blender/blenkernel/BKE_spline.hh +++ b/source/blender/blenkernel/BKE_spline.hh @@ -198,15 +198,17 @@ class BezierSpline final : public Spline { }; private: - blender::Vector<HandleType> handle_types_left_; - blender::Vector<blender::float3> handle_positions_left_; blender::Vector<blender::float3> positions_; - blender::Vector<HandleType> handle_types_right_; - blender::Vector<blender::float3> handle_positions_right_; blender::Vector<float> radii_; blender::Vector<float> tilts_; int resolution_; + blender::Vector<HandleType> handle_types_left_; + blender::Vector<HandleType> handle_types_right_; + + blender::Vector<blender::float3> handle_positions_left_; + blender::Vector<blender::float3> handle_positions_right_; + /** Start index in evaluated points array for every control point. */ mutable blender::Vector<int> offset_cache_; mutable std::mutex offset_cache_mutex_; @@ -229,14 +231,14 @@ class BezierSpline final : public Spline { } BezierSpline(const BezierSpline &other) : Spline((Spline &)other), - handle_types_left_(other.handle_types_left_), - handle_positions_left_(other.handle_positions_left_), positions_(other.positions_), - handle_types_right_(other.handle_types_right_), - handle_positions_right_(other.handle_positions_right_), radii_(other.radii_), tilts_(other.tilts_), - resolution_(other.resolution_) + resolution_(other.resolution_), + handle_types_left_(other.handle_types_left_), + handle_types_right_(other.handle_types_right_), + handle_positions_left_(other.handle_positions_left_), + handle_positions_right_(other.handle_positions_right_) { } @@ -299,7 +301,6 @@ class BezierSpline final : public Spline { void evaluate_bezier_segment(const int index, const int next_index, blender::MutableSpan<blender::float3> positions) const; - blender::Array<int> evaluated_point_offsets() const; }; /** |