From 7aed8f69d14db5b9d8c438c126f552c85ecb274e Mon Sep 17 00:00:00 2001 From: mano-wii Date: Wed, 28 Aug 2019 20:04:26 -0300 Subject: Fix possible endless loop in AutoMerge and Split --- source/blender/editors/mesh/editmesh_automerge.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source/blender/editors/mesh/editmesh_automerge.c') diff --git a/source/blender/editors/mesh/editmesh_automerge.c b/source/blender/editors/mesh/editmesh_automerge.c index 57c8c0f7fa8..0ca86e2f4eb 100644 --- a/source/blender/editors/mesh/editmesh_automerge.c +++ b/source/blender/editors/mesh/editmesh_automerge.c @@ -198,6 +198,11 @@ static void edbm_automerge_weld_linked_wire_edges_into_linked_faces(BMesh *bm, } edgenet[edgenet_len++] = e; v_other = BM_edge_other_vert(e, v_other); + if (v_other == v) { + /* Endless loop. */ + break; + } + BMEdge *e_next = BM_DISK_EDGE_NEXT(e, v_other); if (e_next == e) { /* Vert is wire_endpoint */ -- cgit v1.2.3