From 780be0d918fec1fce4ae0ffabaad948a7e12549c Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 22 Sep 2011 12:07:02 +0000 Subject: Fix #28695: path/beziercirlce defined surface dissapears when deleting subdv of path until toggling end point option Clamp order when deleting points from nurb curve. Also fixed incorrect free caused by non-initialized knots array when deleting segment from non-cyclic nurb. --- source/blender/editors/curve/editcurve.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 75188411f41..91c06e0f125 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -5777,6 +5777,7 @@ static int delete_exec(bContext *C, wmOperator *op) clamp_nurb_order_u(nu); }*/ } + clamp_nurb_order_u(nu); nurbs_knot_calc_u(nu); } nu= next; @@ -5925,7 +5926,14 @@ static int delete_exec(bContext *C, wmOperator *op) MEM_freeN(nu1->bp); nu1->bp= bp; nu1->pntsu= a; + nu1->knotsu= NULL; nu->pntsu= cut+1; + + clamp_nurb_order_u(nu); + nurbs_knot_calc_u(nu); + + clamp_nurb_order_u(nu1); + nurbs_knot_calc_u(nu1); } } } -- cgit v1.2.3