[Bf-blender-cvs] [6732da8] master: Fix weld edges into faces - eternal loop

[Campbell Barton]

Commit: 6732da83406312d2d6781f207e3448b703b92124
Author: Campbell Barton
Date:   Thu Dec 24 03:26:32 2015 +1100
Branches: master
https://developer.blender.org/rB6732da83406312d2d6781f207e3448b703b92124

Fix weld edges into faces - eternal loop

Would happen with complex edge-nets mixed with faces.

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

M	source/blender/bmesh/intern/bmesh_polygon_edgenet.c

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

diff --git a/source/blender/bmesh/intern/bmesh_polygon_edgenet.c b/source/blender/bmesh/intern/bmesh_polygon_edgenet.c
index d2a20be..d2209f4 100644
--- a/source/blender/bmesh/intern/bmesh_polygon_edgenet.c
+++ b/source/blender/bmesh/intern/bmesh_polygon_edgenet.c
@@ -1007,7 +1007,7 @@ static BMVert *bm_face_split_edgenet_partial_connect(BMesh *bm, BMVert *v_delimi
 	bool is_delimit = false;
 	FOREACH_VERT_EDGE(v_delimit, e_iter, {
 		BMVert *v_step = BM_edge_other_vert(e_iter, v_delimit);
-		if (BM_elem_flag_test(v_step, VERT_NOT_IN_STACK)) {
+		if (BM_elem_flag_test(v_step, VERT_NOT_IN_STACK) && BM_edge_is_wire(e_iter)) {
 			is_delimit = true;  /* if one vertex is valid - we have a mix */
 		}
 		else {