[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23154] trunk/blender/source/blender/ editors: - adding curves didnt work if EnterEditmode option was off.

[Campbell Barton]

Revision: 23154
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23154
Author:   campbellbarton
Date:     2009-09-12 20:09:59 +0200 (Sat, 12 Sep 2009)

Log Message:
-----------
- adding curves didnt work if EnterEditmode option was off.
- adding a curve in editmode now is 3D, if the curve its added in is 3D.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/curve/editcurve.c
    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	2009-09-12 17:16:12 UTC (rev 23153)
+++ trunk/blender/source/blender/editors/curve/editcurve.c	2009-09-12 18:09:59 UTC (rev 23154)
@@ -4704,6 +4704,7 @@
 	float *curs, cent[3],vec[3],imat[3][3],mat[3][3];
 	float fac,cmat[3][3], grid;
 	int a, b, cutype, stype;
+	int force_3d = ((Curve *)obedit->data)->flag & CU_3D; /* could be adding to an existing 3D curve */
 	
 	cutype= type & CU_TYPE;	// poly, bezier, nurbs, etc
 	stype= type & CU_PRIMITIVE;
@@ -4760,7 +4761,7 @@
 			rename_id((ID *)obedit->data, "Curve");
 		}
 		if(cutype==CU_BEZIER) {
-			nu->flag= CU_2D;
+			if (!force_3d) nu->flag |= CU_2D;
 			nu->pntsu= 2;
 			nu->bezt =
 				(BezTriple*)MEM_callocN(2 * sizeof(BezTriple), "addNurbprim1");
@@ -4869,7 +4870,7 @@
 			rename_id((ID *)obedit->data, "CurveCircle");
 		}
 		if(cutype==CU_BEZIER) {
-			nu->flag= CU_2D;
+			if (!force_3d) nu->flag |= CU_2D;
 			nu->pntsu= 4;
 			nu->bezt= callocstructN(BezTriple, 4, "addNurbprim1");
 			nu->flagu= CU_CYCLIC;

Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c	2009-09-12 17:16:12 UTC (rev 23153)
+++ trunk/blender/source/blender/editors/object/object_add.c	2009-09-12 18:09:59 UTC (rev 23154)
@@ -307,7 +307,6 @@
 	
 	/* userdef */
 	if (newob && (U.flag & USER_ADD_EDITMODE)==0) {
-		ED_object_enter_editmode(C, 0);
 		ED_object_exit_editmode(C, EM_FREEDATA);
 	}