Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-11-04 06:35:54 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-11-04 06:52:45 +0300
commit0eb1cceea1d87d259d20686e0a88043a25617858 (patch)
tree8fb89767d732955402a14f43739df7820f0b3d59 /source/blender/editors/mesh
parent101c3d4ce4554a4d00ff89830c6b500f3e986365 (diff)
Fix T65449: Rip wire edges show error even when it works
Thanks to @zeddb for finding the root cause.
Diffstat (limited to 'source/blender/editors/mesh')
-rw-r--r--source/blender/editors/mesh/editmesh_rip.c3
1 files changed, 2 insertions, 1 deletions
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;
}