diff options
| author | Howard Trickey <howard.trickey@gmail.com> | 2012-11-23 07:15:16 +0400 |
|---|---|---|
| committer | Howard Trickey <howard.trickey@gmail.com> | 2012-11-23 07:15:16 +0400 |
| commit | 7189a9db514e2ba8f79ed3cf5bc6d00ea6ff4b8c (patch) | |
| tree | f4c15c03f837c1dd52354173980e5c36c319b4bd /source/blender/editors/mesh | |
| parent | f403ca34c7d6e9856ca669d0684b1f4eea4dbf11 (diff) | |
Fix bevel crash in OSX debug build.
Code to select from output slot moved before
EDBM_op_finish, which frees slot buffers.
Diffstat (limited to 'source/blender/editors/mesh')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 7 |
1 files changed, 3 insertions, 4 deletions
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; |