From 7189a9db514e2ba8f79ed3cf5bc6d00ea6ff4b8c Mon Sep 17 00:00:00 2001 From: Howard Trickey Date: Fri, 23 Nov 2012 03:15:16 +0000 Subject: Fix bevel crash in OSX debug build. Code to select from output slot moved before EDBM_op_finish, which frees slot buffers. --- source/blender/editors/mesh/editmesh_tools.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'source/blender/editors/mesh') diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 1d546a5b7ce..8fce8672b5c 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -4766,10 +4766,6 @@ static int edbm_bevel_calc(bContext *C, wmOperator *op) 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 @@ static int edbm_bevel_calc(bContext *C, wmOperator *op) 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; -- cgit v1.2.3