diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-22 16:07:02 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-22 16:07:02 +0400 |
| commit | 780be0d918fec1fce4ae0ffabaad948a7e12549c (patch) | |
| tree | d6f01bb172c7935e40299e1a8a65ed4e91cbc9fa | |
| parent | aa809e6f78d5904337038cdaa104cd52a4e7c7d5 (diff) | |
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.
| -rw-r--r-- | source/blender/editors/curve/editcurve.c | 8 |
1 files changed, 8 insertions, 0 deletions
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); } } } |