[Bf-blender-cvs] [4333991b7bc] master: Cleanup: Reorder class variable declarations
Hans Goudey
noreply at git.blender.org
Tue May 11 02:33:19 CEST 2021
Commit: 4333991b7bc563a6d11632ed3968623f2545c830
Author: Hans Goudey
Date: Mon May 10 19:33:12 2021 -0500
Branches: master
https://developer.blender.org/rB4333991b7bc563a6d11632ed3968623f2545c830
Cleanup: Reorder class variable declarations
The order was arbitrary, and rearranging the declarations
makes the class look less messy, and makes room for future comments.
===================================================================
M source/blender/blenkernel/BKE_spline.hh
===================================================================
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;
};
/**
More information about the Bf-blender-cvs
mailing list