diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-29 07:25:13 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-29 07:47:06 +0300 |
| commit | 34257329263c3af108736b8d1047d48091e82d92 (patch) | |
| tree | 29307361dce6c7bfced0b7b0887278df3c00b568 /source/blender/bmesh/tools/bmesh_decimate_collapse.c | |
| parent | 336885bebaa8c7b60041b139f02a29da475cf3ea (diff) | |
BLI_heap: minor changes to the API
Recent addition of 'reinsert' didn't match logic for ghash API.
Rename to BLI_heap_node_value_update,
also add BLI_heap_insert_or_update since it's a common operation.
Diffstat (limited to 'source/blender/bmesh/tools/bmesh_decimate_collapse.c')
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_decimate_collapse.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.c b/source/blender/bmesh/tools/bmesh_decimate_collapse.c index a081a1b70e4..0a1271c2aa9 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c +++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c @@ -337,12 +337,7 @@ static void bm_decim_build_edge_cost_single( } } - 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); - } + BLI_heap_insert_or_update(eheap, &eheap_table[BM_elem_index_get(e)], cost, e); return; clear: |