diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-10-28 06:05:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-10-28 06:05:33 +0400 |
| commit | 32644615988277ce60e0447f08d40ef67971bd88 (patch) | |
| tree | 8fe967f21a41e097a7e1c2e56b11cab6fdf700dd /source/blender/modifiers/intern/MOD_decimate.c | |
| parent | 0773fd7b78a4faf0dff69795842c3f1f82a93b9f (diff) | |
move bmesh array lookup data and utility functions from editmesh into bmesh,
since enough bmesh operations can also take advantage of direct index lookups on verts/edges/faces.
developers note:
- EDBM_index_arrays_init/ensure/free -> BM_mesh_elem_table_ensure/init/free
- EDBM_vert/edge/face_at_index -> BM_vert/edge/face_at_index
- EDBM_uv_element_map_create/free -> BM_uv_element_map_create/free
- ED_uv_element_get -> BM_uv_element_get
Diffstat (limited to 'source/blender/modifiers/intern/MOD_decimate.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_decimate.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c index a3569cbde68..e4399d1e416 100644 --- a/source/blender/modifiers/intern/MOD_decimate.c +++ b/source/blender/modifiers/intern/MOD_decimate.c @@ -196,9 +196,13 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, /* update for display only */ dmd->face_count = bm->totface; result = CDDM_from_bmesh(bm, FALSE); - BLI_assert(bm->vtoolflagpool == NULL); /* make sure we never alloc'd this */ - BLI_assert(bm->etoolflagpool == NULL); - BLI_assert(bm->ftoolflagpool == NULL); + BLI_assert(bm->vtoolflagpool == NULL && + bm->etoolflagpool == NULL && + bm->ftoolflagpool == NULL); /* make sure we never alloc'd these */ + BLI_assert(bm->vtable == NULL && + bm->etable == NULL && + bm->ftable == NULL); + BM_mesh_free(bm); #ifdef USE_TIMEIT |