diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-20 09:53:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-20 09:53:12 +0300 |
| commit | d5f87bdde68f3849b353989d0af296ea0b7e402b (patch) | |
| tree | b1bd28ef2509cc68531cf35eb70f6dc4f70cab6c /source/blender/bmesh/intern | |
| parent | 320e7f5322a56ffcb3174d200701bb7a8c43ccef (diff) | |
| parent | f7d216c1b6061260ffba4fc63a2ff45f212d213f (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/bmesh/intern')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_polygon_edgenet.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/bmesh/intern/bmesh_polygon_edgenet.c b/source/blender/bmesh/intern/bmesh_polygon_edgenet.c index 4703dbf3bcd..53874e4ed96 100644 --- 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 */ |