[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26424] trunk/blender/source/blender/ editors/object/object_add.c: Fix #20876: adjusting the settings after adding a new curve, surface,

[Brecht Van Lommel]

Revision: 26424
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26424
Author:   blendix
Date:     2010-01-30 10:34:54 +0100 (Sat, 30 Jan 2010)

Log Message:
-----------
Fix #20876: adjusting the settings after adding a new curve, surface,
or metaball creates duplicates, these did two undo pushes when only
one is needed.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_add.c

Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c	2010-01-30 09:32:05 UTC (rev 26423)
+++ trunk/blender/source/blender/editors/object/object_add.c	2010-01-30 09:34:54 UTC (rev 26424)
@@ -379,7 +379,7 @@
 		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|EM_DO_UNDO);
+			ED_object_exit_editmode(C, EM_FREEDATA);
 	}
 	else {
 		ob= ED_object_add_type(C, OB_EMPTY, loc, rot, FALSE, layer);
@@ -517,7 +517,7 @@
 	
 	/* userdef */
 	if (newob && !enter_editmode) {
-		ED_object_exit_editmode(C, EM_FREEDATA|EM_DO_UNDO);
+		ED_object_exit_editmode(C, EM_FREEDATA);
 	}
 	
 	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);
@@ -603,7 +603,7 @@
 	
 	/* userdef */
 	if (newob && !enter_editmode) {
-		ED_object_exit_editmode(C, EM_FREEDATA|EM_DO_UNDO);
+		ED_object_exit_editmode(C, EM_FREEDATA);
 	}
 	
 	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);
@@ -668,7 +668,7 @@
 	
 	/* userdef */
 	if (newob && !enter_editmode) {
-		ED_object_exit_editmode(C, EM_FREEDATA|EM_DO_UNDO);
+		ED_object_exit_editmode(C, EM_FREEDATA);
 	}
 	
 	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);
@@ -783,9 +783,8 @@
 	add_primitive_bone(CTX_data_scene(C), v3d, rv3d);
 
 	/* userdef */
-	if (newob && !enter_editmode) {
-		ED_object_exit_editmode(C, EM_FREEDATA|EM_DO_UNDO);
-	}
+	if (newob && !enter_editmode)
+		ED_object_exit_editmode(C, EM_FREEDATA);
 	
 	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);