[Bf-blender-cvs] [4dd9496] master: Fix for recent error (editmesh triangulate crashed).

Campbell Barton noreply at git.blender.org
Wed Nov 27 03:04:31 CET 2013


Commit: 4dd949632acd352dcac9432a89d3f33e1d2bc3da
Author: Campbell Barton
Date:   Wed Nov 27 13:00:40 2013 +1100
http://developer.blender.org/rB4dd949632acd352dcac9432a89d3f33e1d2bc3da

Fix for recent error (editmesh triangulate crashed).

===================================================================

M	source/blender/editors/mesh/editmesh_tools.c

===================================================================

diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 83cc5df..d3d03e8 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -3210,14 +3210,14 @@ static int edbm_quads_convert_to_tris_exec(bContext *C, wmOperator *op)
 	EDBM_op_init(em, &bmop, op, "triangulate faces=%hf quad_method=%i ngon_method=%i", BM_ELEM_SELECT, quad_method, ngon_method);
 	BMO_op_exec(em->bm, &bmop);
 
-	if (!EDBM_op_finish(em, &bmop, op, true)) {
-		return OPERATOR_CANCELLED;
-	}
-
 	/* select the output */
 	BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "faces.out", BM_FACE, BM_ELEM_SELECT, true);
 	EDBM_selectmode_flush(em);
 
+	if (!EDBM_op_finish(em, &bmop, op, true)) {
+		return OPERATOR_CANCELLED;
+	}
+
 	EDBM_update_generic(em, true, true);
 
 	return OPERATOR_FINISHED;




More information about the Bf-blender-cvs mailing list