[Bf-blender-cvs] [765c82e92d6] master: Fix possible endless loop in Auto Merge & Split

Germano Cavalcante noreply at git.blender.org
Mon Mar 23 21:40:18 CET 2020


Commit: 765c82e92d677eeba0cdc91f0efe99255f285055
Author: Germano Cavalcante
Date:   Mon Mar 23 17:40:08 2020 -0300
Branches: master
https://developer.blender.org/rB765c82e92d677eeba0cdc91f0efe99255f285055

Fix possible endless loop in Auto Merge & Split

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

M	source/blender/bmesh/tools/bmesh_intersect_edges.c

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

diff --git a/source/blender/bmesh/tools/bmesh_intersect_edges.c b/source/blender/bmesh/tools/bmesh_intersect_edges.c
index 6a51bceb6ac..2df7c85871d 100644
--- a/source/blender/bmesh/tools/bmesh_intersect_edges.c
+++ b/source/blender/bmesh/tools/bmesh_intersect_edges.c
@@ -943,6 +943,8 @@ bool BM_mesh_intersect_edges(
                     !BM_elem_flag_test(e_test->v2, BM_ELEM_TAG)) {
                   continue;
                 }
+                /* Avoids endless loop. */
+                BM_elem_flag_enable(e_test, BM_ELEM_TAG);
               }
               else if (!BM_edge_is_wire(e_net)) {
                 continue;



More information about the Bf-blender-cvs mailing list