[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33478] trunk/blender/source/blender/ editors/curve/editcurve.c: - Fixed dead-lock when subviding curve

[Sergey Sharybin]

Revision: 33478
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33478
Author:   nazgul
Date:     2010-12-05 08:08:14 +0100 (Sun, 05 Dec 2010)

Log Message:
-----------
- Fixed dead-lock when subviding curve
- Hard-limit for cuts number is set to INT_MAX, soft limit to 10 (same as for meshes)

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	2010-12-05 06:40:47 UTC (rev 33477)
+++ trunk/blender/source/blender/editors/curve/editcurve.c	2010-12-05 07:08:14 UTC (rev 33478)
@@ -2647,7 +2647,7 @@
 				}
 				while(a--) {
 					memcpy(beztn, prevbezt, sizeof(BezTriple));
-					keyIndex_updateBezt(editnurb, prevbezt, beztn, 1, 1);
+					keyIndex_updateBezt(editnurb, prevbezt, beztn, 1, 0);
 					beztn++;
 
 					if( BEZSELECTED_HIDDENHANDLES(cu, prevbezt) && BEZSELECTED_HIDDENHANDLES(cu, bezt) ) {
@@ -2692,7 +2692,7 @@
 				/* last point */
 				if((nu->flagu & CU_NURB_CYCLIC)==0) {
 					memcpy(beztn, prevbezt, sizeof(BezTriple));
-					keyIndex_updateBezt(editnurb, prevbezt, beztn, 1, 1);
+					keyIndex_updateBezt(editnurb, prevbezt, beztn, 1, 0);
 				}
 
 				MEM_freeN(nu->bezt);
@@ -2744,7 +2744,7 @@
 				}
 				while(a--) {
 					memcpy(bpn, prevbp, sizeof(BPoint));
-					keyIndex_updateBP(editnurb, prevbp, bpn, 1, 1);
+					keyIndex_updateBP(editnurb, prevbp, bpn, 1, 0);
 					bpn++;
 
 					if( (bp->f1 & SELECT) && (prevbp->f1 & SELECT) ) {
@@ -2763,7 +2763,7 @@
 				}
 				if((nu->flagu & CU_NURB_CYCLIC)==0) { /* last point */
 					memcpy(bpn, prevbp, sizeof(BPoint));
-					keyIndex_updateBP(editnurb, prevbp, bpn, 1, 1);
+					keyIndex_updateBP(editnurb, prevbp, bpn, 1, 0);
 				}
 
 				MEM_freeN(nu->bp);
@@ -2851,7 +2851,7 @@
 				for(a=0; a<nu->pntsv; a++) {
 					for(b=0; b<nu->pntsu; b++) {
 						*bpn= *bp;
-						keyIndex_updateBP(editnurb, bp, bpn, 1, 1);
+						keyIndex_updateBP(editnurb, bp, bpn, 1, 0);
 						bpn++; 
 						bp++;
 						if(b<nu->pntsu-1) {
@@ -2908,7 +2908,7 @@
 					for(a=0; a<nu->pntsv; a++) {
 						for(b=0; b<nu->pntsu; b++) {
 							*bpn= *bp;
-							keyIndex_updateBP(editnurb, bp, bpn, 1, 1);
+							keyIndex_updateBP(editnurb, bp, bpn, 1, 0);
 							bpn++;
 							bp++;
 						}
@@ -2955,7 +2955,7 @@
 						for(a=0; a<nu->pntsv; a++) {
 							for(b=0; b<nu->pntsu; b++) {
 								*bpn= *bp;
-								keyIndex_updateBP(editnurb, bp, bpn, 1, 1);
+								keyIndex_updateBP(editnurb, bp, bpn, 1, 0);
 								bpn++; 
 								bp++;
 								if( (b<nu->pntsu-1) && usel[b]==nu->pntsv && usel[b+1]==nu->pntsv ) {
@@ -3017,7 +3017,7 @@
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 
-	RNA_def_int(ot->srna, "number_cuts", 1, 1, 100, "Number of cuts", "", 1, 100);
+	RNA_def_int(ot->srna, "number_cuts", 1, 1, INT_MAX, "Number of cuts", "", 1, 10);
 }
 
 /******************** find nearest ************************/