diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-03-25 00:52:22 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-03-25 00:54:41 +0400 |
| commit | 7bb84912efbaed72a0dd06ef6e4e8ed81df5529c (patch) | |
| tree | a17932acd34750a5b75a9b82fc3823836de995b1 /source/blender/bmesh/intern | |
| parent | b0a8e4ced15745b6545de652790391e53cf61628 (diff) | |
Code cleanup: ifdef debug only checks and simplify manifold test
Diffstat (limited to 'source/blender/bmesh/intern')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_core.c | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mods.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index bbfee692df4..690fdcce691 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -1692,12 +1692,12 @@ BMEdge *bmesh_jekv(BMesh *bm, BMEdge *e_kill, BMVert *v_kill, const bool check_e BLI_mempool_free(bm->lpool, loops[i]); } } - +#ifndef NDEBUG /* Validate radial cycle of e_old */ edok = bmesh_radial_validate(radlen, e_old->l); BMESH_ASSERT(edok != false); +#endif } - /* deallocate edge */ bm_kill_only_edge(bm, e_kill); diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index a619947ddc9..a72ebbb6f2c 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -178,8 +178,7 @@ bool BM_disk_dissolve(BMesh *bm, BMVert *v) e = v->e; do { f = NULL; - len = bmesh_radial_length(e->l); - if (len == 2 && (e != baseedge) && (e != keepedge)) { + if (BM_edge_is_manifold(e) && (e != baseedge) && (e != keepedge)) { f = BM_faces_join_pair(bm, e->l->f, e->l->radial_next->f, e, true); /* return if couldn't join faces in manifold * conditions */ |