From 8bac5ea0c5835a4ce0a23723e05f65a650c86214 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 14 Oct 2017 17:54:43 +1100 Subject: Correct bezier curve assert Bezier curves should have v-points zero'd. --- source/blender/blenkernel/intern/curve.c | 3 ++- source/blender/editors/curve/editcurve_paint.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 9c7473f24d1..6c6019748d6 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -741,7 +741,7 @@ BezTriple *BKE_nurb_bezt_get_prev(Nurb *nu, BezTriple *bezt) BezTriple *bezt_prev; BLI_assert(ARRAY_HAS_ITEM(bezt, nu->bezt, nu->pntsu)); - BLI_assert(nu->pntsv == 1); + BLI_assert(nu->pntsv <= 1); if (bezt == nu->bezt) { if (nu->flagu & CU_NURB_CYCLIC) { @@ -4139,6 +4139,7 @@ bool BKE_nurb_type_convert(Nurb *nu, const short type, const bool use_handles) MEM_freeN(nu->bp); nu->bp = NULL; nu->pntsu = nr; + nu->pntsv = 0; nu->type = CU_BEZIER; BKE_nurb_handles_calc(nu); } diff --git a/source/blender/editors/curve/editcurve_paint.c b/source/blender/editors/curve/editcurve_paint.c index 5c3a694929e..4602945d11c 100644 --- a/source/blender/editors/curve/editcurve_paint.c +++ b/source/blender/editors/curve/editcurve_paint.c @@ -780,7 +780,7 @@ static int curve_draw_exec(bContext *C, wmOperator *op) const float radius_range = cps->radius_max - cps->radius_min; Nurb *nu = MEM_callocN(sizeof(Nurb), __func__); - nu->pntsv = 1; + nu->pntsv = 0; nu->resolu = cu->resolu; nu->resolv = cu->resolv; nu->flag |= CU_SMOOTH; -- cgit v1.2.3