diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-14 09:58:29 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-14 09:58:29 +0300 |
| commit | 0e35c900d82f8a5ef173c5d1c8e0170975f9a94d (patch) | |
| tree | eeaabdbd26150d1b1b735929908fc6bf039b29a2 /source/blender | |
| parent | b0fa10f8809a412aaf1136c97ac0eef30ec5e686 (diff) | |
| parent | 8bac5ea0c5835a4ce0a23723e05f65a650c86214 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/curve.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/curve/editcurve_paint.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 5fbaae7212b..a93bda215a0 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -745,7 +745,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) { @@ -4144,6 +4144,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 f6bbff2f5d4..a1b73a54e3d 100644 --- a/source/blender/editors/curve/editcurve_paint.c +++ b/source/blender/editors/curve/editcurve_paint.c @@ -805,7 +805,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; |