diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-11-30 20:15:49 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-11-30 20:15:49 +0400 |
| commit | d72a6c3018f754cc1628267edd45f6a83afbfa42 (patch) | |
| tree | 015ae8d1395d0755d71d66d076718b84b64ce495 /source/blender/bmesh/intern/bmesh_mods.c | |
| parent | 46636a601e03eec7d78bc31064065980609187e6 (diff) | |
fix for another error in my own recent commit, beauty fill crashed.
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_mods.c')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mods.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index dc8b52423ab..89516061f91 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -142,9 +142,10 @@ int BM_disk_dissolve(BMesh *bm, BMVert *v) return FALSE; } #else - BM_faces_join_pair(bm, e->l->f, e->l->radial_next->f, e, TRUE); - - if (!BM_vert_collapse_faces(bm, v->e, v, 1.0, FALSE, TRUE)) { + if (UNLIKELY(!BM_faces_join_pair(bm, e->l->f, e->l->radial_next->f, e, TRUE))) { + return FALSE; + } + else if (UNLIKELY(!BM_vert_collapse_faces(bm, v->e, v, 1.0, FALSE, TRUE))) { return FALSE; } #endif |