[Bf-blender-cvs] [0eb1cceea1d] blender-v2.91-release: Fix T65449: Rip wire edges show error even when it works
Campbell Barton
noreply at git.blender.org
Wed Nov 4 04:53:02 CET 2020
Commit: 0eb1cceea1d87d259d20686e0a88043a25617858
Author: Campbell Barton
Date: Wed Nov 4 14:35:54 2020 +1100
Branches: blender-v2.91-release
https://developer.blender.org/rB0eb1cceea1d87d259d20686e0a88043a25617858
Fix T65449: Rip wire edges show error even when it works
Thanks to @zeddb for finding the root cause.
===================================================================
M source/blender/editors/mesh/editmesh_rip.c
===================================================================
diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c
index 66d57de70d3..03b4cda2005 100644
--- a/source/blender/editors/mesh/editmesh_rip.c
+++ b/source/blender/editors/mesh/editmesh_rip.c
@@ -880,6 +880,7 @@ static int edbm_rip_invoke__edge(bContext *C, const wmEvent *event, Object *obed
BMLoop *l;
BMEdge *e_best;
BMVert *v;
+ const int totvert_orig = bm->totvert;
const int totedge_orig = bm->totedge;
float projectMat[4][4], fmval[3] = {event->mval[0], event->mval[1]};
@@ -988,7 +989,7 @@ static int edbm_rip_invoke__edge(bContext *C, const wmEvent *event, Object *obed
MEM_freeN(fill_uloop_pairs);
}
- if (totedge_orig == bm->totedge) {
+ if ((totvert_orig == bm->totvert) && (totedge_orig == bm->totedge)) {
return OPERATOR_CANCELLED;
}
More information about the Bf-blender-cvs
mailing list