diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-28 21:23:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-28 21:28:00 +0300 |
| commit | 336885bebaa8c7b60041b139f02a29da475cf3ea (patch) | |
| tree | 7adb7022a3beee361e17fc94ba2369394baf5661 /source/blender/bmesh/tools | |
| parent | 4af1af70ad41015d0126837e856d87b930f61655 (diff) | |
Use BLI_heap_reinsert for decimate and beautify
Improves performance for high poly meshes,
~70% faster for decimate, only ~10% for beautify.
Diffstat (limited to 'source/blender/bmesh/tools')
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_decimate_collapse.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.c b/source/blender/bmesh/tools/bmesh_decimate_collapse.c index d734d9b6ae1..a081a1b70e4 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c +++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c @@ -256,10 +256,6 @@ static void bm_decim_build_edge_cost_single( { float cost; - if (eheap_table[BM_elem_index_get(e)]) { - BLI_heap_remove(eheap, eheap_table[BM_elem_index_get(e)]); - } - if (UNLIKELY(vweights && ((vweights[BM_elem_index_get(e->v1)] == 0.0f) || (vweights[BM_elem_index_get(e->v2)] == 0.0f)))) @@ -341,10 +337,18 @@ static void bm_decim_build_edge_cost_single( } } - eheap_table[BM_elem_index_get(e)] = BLI_heap_insert(eheap, cost, e); + if (eheap_table[BM_elem_index_get(e)]) { + BLI_heap_reinsert(eheap, eheap_table[BM_elem_index_get(e)], cost); + } + else { + eheap_table[BM_elem_index_get(e)] = BLI_heap_insert(eheap, cost, e); + } return; clear: + if (eheap_table[BM_elem_index_get(e)]) { + BLI_heap_remove(eheap, eheap_table[BM_elem_index_get(e)]); + } eheap_table[BM_elem_index_get(e)] = NULL; } |