[Bf-blender-cvs] [c6180c2249e] blender-v2.81-release: Fix T71053: Poly Build tool crashes blender when deleting wire vertices

[Pablo Dobarro]

Commit: c6180c2249e1864aefa244cecefb47a2f4fd508f
Author: Pablo Dobarro
Date:   Thu Oct 31 01:06:20 2019 +0100
Branches: blender-v2.81-release
https://developer.blender.org/rBc6180c2249e1864aefa244cecefb47a2f4fd508f

Fix T71053: Poly Build tool crashes blender when deleting wire vertices

Dissolve the vertex when it is wire instead of trying to collapse the
edge. When collapsing the edge, ##v_kill->e## was not NULL, so the
assert in ##bmesh_kernel_join_vert_kill_edge## fails.

Reviewed By: jbakker

Maniphest Tasks: T71053

Differential Revision: https://developer.blender.org/D6159

===================================================================

M	source/blender/editors/mesh/editmesh_polybuild.c

===================================================================

diff --git a/source/blender/editors/mesh/editmesh_polybuild.c b/source/blender/editors/mesh/editmesh_polybuild.c
index 21c850160dd..a91f0f9274e 100644
--- a/source/blender/editors/mesh/editmesh_polybuild.c
+++ b/source/blender/editors/mesh/editmesh_polybuild.c
@@ -216,7 +216,7 @@ static int edbm_polybuild_delete_at_cursor_invoke(bContext *C,
   }
   if (ele_act->head.htype == BM_VERT) {
     BMVert *v_act = (BMVert *)ele_act;
-    if (BM_vert_is_edge_pair(v_act)) {
+    if (BM_vert_is_edge_pair(v_act) && !BM_vert_is_wire(v_act)) {
       BM_edge_collapse(bm, v_act->e, v_act, true, true);
       changed = true;
     }