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>2022-03-11 23:55:42 +0300
committerHans Goudey <h.goudey@me.com>2022-03-11 23:55:42 +0300
commitdb7c4d7a1cf3a4aab7d40df9de5f3f3d33e88cb6 (patch)
treed1008b32109f94219bc12c6f40baab9aa0387896 /source/blender/blenkernel/intern/curve_eval.cc
parentbd9f94e91720e6d2ce5308344e83c5a787351669 (diff)
Cleanup: Use new enum for NURBS curve knots modes
Move the definition of the enum to `Curves` DNA, since the values will be saved in files, and ongoing development needs to use this.
Diffstat (limited to 'source/blender/blenkernel/intern/curve_eval.cc')
-rw-r--r--source/blender/blenkernel/intern/curve_eval.cc15
1 files changed, 7 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/curve_eval.cc b/source/blender/blenkernel/intern/curve_eval.cc
index 59c2155255b..191a510947e 100644
--- a/source/blender/blenkernel/intern/curve_eval.cc
+++ b/source/blender/blenkernel/intern/curve_eval.cc
@@ -203,21 +203,21 @@ static Spline::NormalCalculationMode normal_mode_from_dna_curve(const int twist_
return Spline::NormalCalculationMode::Minimum;
}
-static NURBSpline::KnotsMode knots_mode_from_dna_nurb(const short flag)
+static KnotsMode knots_mode_from_dna_nurb(const short flag)
{
switch (flag & (CU_NURB_ENDPOINT | CU_NURB_BEZIER)) {
case CU_NURB_ENDPOINT:
- return NURBSpline::KnotsMode::EndPoint;
+ return NURBS_KNOT_MODE_ENDPOINT;
case CU_NURB_BEZIER:
- return NURBSpline::KnotsMode::Bezier;
+ return NURBS_KNOT_MODE_BEZIER;
case CU_NURB_ENDPOINT | CU_NURB_BEZIER:
- return NURBSpline::KnotsMode::EndPointBezier;
+ return NURBS_KNOT_MODE_ENDPOINT_BEZIER;
default:
- return NURBSpline::KnotsMode::Normal;
+ return NURBS_KNOT_MODE_NORMAL;
}
BLI_assert_unreachable();
- return NURBSpline::KnotsMode::Normal;
+ return NURBS_KNOT_MODE_NORMAL;
}
static SplinePtr spline_from_dna_bezier(const Nurb &nurb)
@@ -421,8 +421,7 @@ std::unique_ptr<CurveEval> curves_to_curve_eval(const Curves &curves)
nurb_spline->resize(point_range.size());
nurb_spline->weights().copy_from(nurbs_weights.slice(point_range));
nurb_spline->set_order(nurbs_orders[curve_index]);
- nurb_spline->knots_mode = static_cast<NURBSpline::KnotsMode>(
- nurbs_knots_modes[curve_index]);
+ nurb_spline->knots_mode = static_cast<KnotsMode>(nurbs_knots_modes[curve_index]);
spline = std::move(nurb_spline);
break;