[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56329] trunk/blender/source/blender/ editors/mesh/editmesh_loopcut.c: fix for regression where tessface weren' t recalculated when running loopcut outside of a macro.

Campbell Barton ideasman42 at gmail.com
Fri Apr 26 21:25:56 CEST 2013


Revision: 56329
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56329
Author:   campbellbarton
Date:     2013-04-26 19:25:56 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
fix for regression where tessface weren't recalculated when running loopcut outside of a macro.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/editmesh_loopcut.c

Modified: trunk/blender/source/blender/editors/mesh/editmesh_loopcut.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_loopcut.c	2013-04-26 19:06:25 UTC (rev 56328)
+++ trunk/blender/source/blender/editors/mesh/editmesh_loopcut.c	2013-04-26 19:25:56 UTC (rev 56329)
@@ -288,6 +288,7 @@
 		edgering_sel(lcd, cuts, true);
 		
 		if (lcd->do_cut) {
+			const bool is_macro = (op->opm != NULL);
 			/* Enable gridfill, so that intersecting loopcut works as one would expect.
 			 * Note though that it will break edgeslide in this specific case.
 			 * See [#31939]. */
@@ -297,11 +298,11 @@
 			                   SUBDIV_SELECT_LOOPCUT, SUBD_PATH, 0, true,
 			                   use_only_quads, 0);
 
-			/* tessface is already re-recalculated */
-			EDBM_update_generic(em, false, true);
+			/* when used in a macro tessface is already re-recalculated */
+			EDBM_update_generic(em, (is_macro == false), true);
 
 			/* we cant slide multiple edges in vertex select mode */
-			if (op->opm && (cuts > 1) && (em->selectmode & SCE_SELECT_VERTEX)) {
+			if (is_macro && (cuts > 1) && (em->selectmode & SCE_SELECT_VERTEX)) {
 				EDBM_selectmode_disable(lcd->vc.scene, em, SCE_SELECT_VERTEX, SCE_SELECT_EDGE);
 			}
 			/* force edge slide to edge select mode in in face select mode */




More information about the Bf-blender-cvs mailing list