[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33267] trunk/blender/source/blender/ editors: Previous commit cleaned up one variable too many, breaking

[Ton Roosendaal]

Revision: 33267
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33267
Author:   ton
Date:     2010-11-23 19:13:49 +0100 (Tue, 23 Nov 2010)

Log Message:
-----------
Previous commit cleaned up one variable too many, breaking
adding torus/tube in Nurbs editmode.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/curve/editcurve.c
    trunk/blender/source/blender/editors/include/ED_curve.h
    trunk/blender/source/blender/editors/object/object_add.c

Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c	2010-11-23 17:28:41 UTC (rev 33266)
+++ trunk/blender/source/blender/editors/curve/editcurve.c	2010-11-23 18:13:49 UTC (rev 33267)
@@ -5727,7 +5727,7 @@
 }
 
 
-Nurb *add_nurbs_primitive(bContext *C, float mat[4][4], int type)
+Nurb *add_nurbs_primitive(bContext *C, float mat[4][4], int type, int newob)
 {
 	static int xzproj= 0;	/* this function calls itself... */
 	Object *obedit= CTX_data_edit_object(C);
@@ -5970,14 +5970,14 @@
 		if( cutype==CU_NURBS ) {
 			Curve *cu= (Curve*)obedit->data;
 			
-			nu= add_nurbs_primitive(C, mat, CU_NURBS|CU_PRIM_CIRCLE);  /* circle */
+			nu= add_nurbs_primitive(C, mat, CU_NURBS|CU_PRIM_CIRCLE, 0);  /* circle */
 			nu->resolu= cu->resolu;
 			nu->flag= CU_SMOOTH;
 			BLI_addtail(editnurb, nu); /* temporal for extrude and translate */
 			vec[0]=vec[1]= 0.0;
 			vec[2]= -grid;
 			
-			if((U.flag & USER_ADD_VIEWALIGNED) == 0) {
+			if(newob && (U.flag & USER_ADD_VIEWALIGNED) == 0) {
 				/* pass */
 			}
 			else {
@@ -6030,7 +6030,7 @@
 
 			BLI_addtail(editnurb, nu); /* temporal for spin */
 
-			if((U.flag & USER_ADD_VIEWALIGNED) == 0)	spin_nurb(umat, obedit, tmp_vec, tmp_cent);
+			if(newob && (U.flag & USER_ADD_VIEWALIGNED) == 0)	spin_nurb(umat, obedit, tmp_vec, tmp_cent);
 			else if ((U.flag & USER_ADD_VIEWALIGNED))			spin_nurb(rv3d->viewmat, obedit, rv3d->viewinv[2], mat[3]);
 			else												spin_nurb(umat, obedit, tmp_vec, mat[3]);
 
@@ -6051,7 +6051,7 @@
 			float tmp_vec[3] = {0.f, 0.f, 1.f};
 			
 			xzproj= 1;
-			nu= add_nurbs_primitive(C, mat, CU_NURBS|CU_PRIM_CIRCLE);  /* circle */
+			nu= add_nurbs_primitive(C, mat, CU_NURBS|CU_PRIM_CIRCLE, 0);  /* circle */
 			xzproj= 0;
 			nu->resolu= cu->resolu;
 			nu->resolv= cu->resolv;
@@ -6059,7 +6059,7 @@
 			BLI_addtail(editnurb, nu); /* temporal for spin */
 
 			/* same as above */
-			if((U.flag & USER_ADD_VIEWALIGNED) == 0)	spin_nurb(umat, obedit, tmp_vec, tmp_cent);
+			if(newob && (U.flag & USER_ADD_VIEWALIGNED) == 0)	spin_nurb(umat, obedit, tmp_vec, tmp_cent);
 			else if ((U.flag & USER_ADD_VIEWALIGNED))			spin_nurb(rv3d->viewmat, obedit, rv3d->viewinv[2], mat[3]);
 			else												spin_nurb(umat, obedit, tmp_vec, mat[3]);
 
@@ -6141,7 +6141,7 @@
 	
 	ED_object_new_primitive_matrix(C, obedit, loc, rot, mat);
 
-	nu= add_nurbs_primitive(C, mat, type);
+	nu= add_nurbs_primitive(C, mat, type, newob);
 	editnurb= curve_get_editcurve(obedit);
 	BLI_addtail(editnurb, nu);
 

Modified: trunk/blender/source/blender/editors/include/ED_curve.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_curve.h	2010-11-23 17:28:41 UTC (rev 33266)
+++ trunk/blender/source/blender/editors/include/ED_curve.h	2010-11-23 18:13:49 UTC (rev 33267)
@@ -63,7 +63,7 @@
 
 int 	mouse_nurb		(struct bContext *C, short mval[2], int extend);
 
-struct Nurb *add_nurbs_primitive(struct bContext *C, float mat[4][4], int type);
+struct Nurb *add_nurbs_primitive(struct bContext *C, float mat[4][4], int type, int newob);
 
 int		isNurbsel		(struct Nurb *nu);;
 

Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c	2010-11-23 17:28:41 UTC (rev 33266)
+++ trunk/blender/source/blender/editors/object/object_add.c	2010-11-23 18:13:49 UTC (rev 33267)
@@ -384,7 +384,7 @@
 		((Curve*)ob->data)->flag |= CU_PATH|CU_3D;
 		ED_object_enter_editmode(C, 0);
 		ED_object_new_primitive_matrix(C, ob, loc, rot, mat);
-		BLI_addtail(curve_get_editcurve(ob), add_nurbs_primitive(C, mat, CU_NURBS|CU_PRIM_PATH));
+		BLI_addtail(curve_get_editcurve(ob), add_nurbs_primitive(C, mat, CU_NURBS|CU_PRIM_PATH, 1));
 
 		if(!enter_editmode)
 			ED_object_exit_editmode(C, EM_FREEDATA);