Merge branch 'master' into blender2.8

2018-12-20 17:53:12 +11:00
parent 320e7f5322 f7d216c1b6
commit d5f87bdde6
1 changed files with 9 additions and 0 deletions
--- a/source/blender/bmesh/intern/bmesh_polygon_edgenet.c
+++ b/source/blender/bmesh/intern/bmesh_polygon_edgenet.c
@@ -1162,7 +1162,16 @@ static BMVert *bm_face_split_edgenet_partial_connect(BMesh *bm, BMVert *v_delimi
 		BM_elem_flag_enable(v_split, VERT_NOT_IN_STACK);

 		BLI_assert(v_delimit->e != NULL);
+
+		/* Degenerate, avoid eternal loop, see: T59074. */
+#if 0
 		BLI_assert(v_split->e != NULL);
+#else
+		if (UNLIKELY(v_split->e == NULL)) {
+			BM_vert_kill(bm, v_split);
+			v_split = NULL;
+		}
+#endif
 	}

 	/* Restore flags */