Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Goudey <h.goudey@me.com>2021-05-12 19:50:35 +0300
committerHans Goudey <h.goudey@me.com>2021-05-12 19:50:35 +0300
commit1a94ae9e4757bfb326a855eeede10196d8f1ffc5 (patch)
tree80ae31b9b80e6282adc233f2bca4ef12d5bfb295 /source/blender/blenkernel/BKE_spline.hh
parent50bf033d3f31b9939a79dea0652731f94da9a3ed (diff)
Cleanup: Simplify public/private specifiers
By rearranging a few variables we can remove redundant specifiers
Diffstat (limited to 'source/blender/blenkernel/BKE_spline.hh')
-rw-r--r--source/blender/blenkernel/BKE_spline.hh12
1 files changed, 4 insertions, 8 deletions
diff --git a/source/blender/blenkernel/BKE_spline.hh b/source/blender/blenkernel/BKE_spline.hh
index f1ffeb664f5..54a8e97d5c6 100644
--- a/source/blender/blenkernel/BKE_spline.hh
+++ b/source/blender/blenkernel/BKE_spline.hh
@@ -64,11 +64,6 @@ class Spline {
Poly,
};
- protected:
- Type type_;
- bool is_cyclic_ = false;
-
- public:
enum NormalCalculationMode {
ZUp,
Minimum,
@@ -78,6 +73,9 @@ class Spline {
NormalCalculationMode normal_mode;
protected:
+ Type type_;
+ bool is_cyclic_ = false;
+
/** Direction of the spline at each evaluated point. */
mutable blender::Vector<blender::float3> evaluated_tangents_cache_;
mutable std::mutex tangent_cache_mutex_;
@@ -99,7 +97,7 @@ class Spline {
{
}
Spline(Spline &other)
- : type_(other.type_), is_cyclic_(other.is_cyclic_), normal_mode(other.normal_mode)
+ : normal_mode(other.normal_mode), type_(other.type_), is_cyclic_(other.is_cyclic_)
{
}
@@ -430,12 +428,10 @@ class NURBSpline final : public Spline {
* points does not change it.
*/
class PolySpline final : public Spline {
- public:
blender::Vector<blender::float3> positions_;
blender::Vector<float> radii_;
blender::Vector<float> tilts_;
- private:
public:
SplinePtr copy() const final;
PolySpline() : Spline(Type::Poly)