[Bf-blender-cvs] [7aed8f69d14] master: Fix possible endless loop in AutoMerge and Split
mano-wii
noreply at git.blender.org
Thu Aug 29 01:10:14 CEST 2019
Commit: 7aed8f69d14db5b9d8c438c126f552c85ecb274e
Author: mano-wii
Date: Wed Aug 28 20:04:26 2019 -0300
Branches: master
https://developer.blender.org/rB7aed8f69d14db5b9d8c438c126f552c85ecb274e
Fix possible endless loop in AutoMerge and Split
===================================================================
M 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 */
More information about the Bf-blender-cvs
mailing list