[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52499] trunk/blender/source/blender/ editors/mesh/editmesh_tools.c: Fix bevel crash in OSX debug build.

Howard Trickey howard.trickey at gmail.com
Fri Nov 23 04:15:26 CET 2012


Revision: 52499
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52499
Author:   howardt
Date:     2012-11-23 03:15:16 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Fix bevel crash in OSX debug build.
Code to select from output slot moved before
EDBM_op_finish, which frees slot buffers.

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

Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2012-11-23 02:10:13 UTC (rev 52498)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2012-11-23 03:15:16 UTC (rev 52499)
@@ -4766,10 +4766,6 @@
 
 	BMO_op_exec(em->bm, &bmop);
 
-	/* no need to de-select existing geometry */
-	if (!EDBM_op_finish(em, &bmop, op, TRUE))
-		return 0;
-
 	if (offset != 0.0f) {
 		/* not essential, but we may have some loose geometry that
 		 * won't get bevel'd and better not leave it selected */
@@ -4777,6 +4773,9 @@
 		BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "faces.out", BM_FACE, BM_ELEM_SELECT, TRUE);
 	}
 
+	/* no need to de-select existing geometry */
+	if (!EDBM_op_finish(em, &bmop, op, TRUE))
+		return 0;
 #else
 	int i;
 




More information about the Bf-blender-cvs mailing list