[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40451] trunk/blender/source/blender/ editors/curve/editcurve.c: Fix #28695: path/ beziercirlce defined surface dissapears when deleting subdv of path until toggling end point option

Sergey Sharybin g.ulairi at gmail.com
Thu Sep 22 14:07:03 CEST 2011


Revision: 40451
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40451
Author:   nazgul
Date:     2011-09-22 12:07:02 +0000 (Thu, 22 Sep 2011)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/curve/editcurve.c

Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c	2011-09-22 12:00:24 UTC (rev 40450)
+++ trunk/blender/source/blender/editors/curve/editcurve.c	2011-09-22 12:07:02 UTC (rev 40451)
@@ -5777,6 +5777,7 @@
 						clamp_nurb_order_u(nu);
 					}*/
 				}
+				clamp_nurb_order_u(nu);
 				nurbs_knot_calc_u(nu);
 			}
 			nu= next;
@@ -5925,7 +5926,14 @@
 					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);
 				}
 			}
 		}




More information about the Bf-blender-cvs mailing list