From f910abaddaec82dde3bd27ae3fa720b37f2359fc Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 21 Apr 2012 06:42:21 +0000 Subject: [PATCH] fix error in recent rip refactor, also add comment. --- source/blender/editors/mesh/editmesh_rip.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c index 37b12803962..c68d2a91460 100644 --- a/source/blender/editors/mesh/editmesh_rip.c +++ b/source/blender/editors/mesh/editmesh_rip.c @@ -658,13 +658,19 @@ static int edbm_rip_invoke__edge(bContext *C, wmOperator *op, wmEvent *event) } } + if (!edbm_rip_call_edgesplit(em, op)) { + return OPERATOR_CANCELLED; + } + + /* note: the output of the bmesh operator is ignored, since we built + * the contiguous loop pairs to split already, its possibe that some + * edge did not split even though it was tagged which would not work + * as expected (but not crash), however there are checks to ensure + * tagged edges will split. So far its not been an issue. */ edbm_ripsel_deselect_helper(bm, eloop_pairs, ar, projectMat, fmval); MEM_freeN(eloop_pairs); - if (!edbm_rip_call_edgesplit(em, op)) { - return OPERATOR_CANCELLED; - } return OPERATOR_FINISHED; }