[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52648] trunk/blender/source/blender/ editors: skip recalculating tessface when adding objects if 'EnterEdit-mode ' is disabled.

Campbell Barton ideasman42 at gmail.com
Thu Nov 29 03:37:44 CET 2012


Revision: 52648
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52648
Author:   campbellbarton
Date:     2012-11-29 02:37:39 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
skip recalculating tessface when adding objects if 'EnterEdit-mode' is disabled.

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

Modified: trunk/blender/source/blender/editors/mesh/editmesh_add.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_add.c	2012-11-29 02:26:04 UTC (rev 52647)
+++ trunk/blender/source/blender/editors/mesh/editmesh_add.c	2012-11-29 02:37:39 UTC (rev 52648)
@@ -86,7 +86,8 @@
 	 * to push this up to edges & faces. */
 	EDBM_selectmode_flush_ex(em, SCE_SELECT_VERTEX);
 
-	EDBM_update_generic(C, em, TRUE);
+	/* only recalc editmode tessface if we are staying in editmode */
+	EDBM_update_generic(C, em, enter_editmode);
 
 	/* userdef */
 	if (*state && !enter_editmode) {

Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c	2012-11-29 02:26:04 UTC (rev 52647)
+++ trunk/blender/source/blender/editors/object/object_add.c	2012-11-29 02:37:39 UTC (rev 52648)
@@ -271,7 +271,7 @@
 		if (RNA_struct_property_is_set(op->ptr, "enter_editmode") && enter_editmode)
 			*enter_editmode = RNA_boolean_get(op->ptr, "enter_editmode");
 		else {
-			*enter_editmode = U.flag & USER_ADD_EDITMODE;
+			*enter_editmode = (U.flag & USER_ADD_EDITMODE) != 0;
 			RNA_boolean_set(op->ptr, "enter_editmode", *enter_editmode);
 		}
 	}




More information about the Bf-blender-cvs mailing list