diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-15 16:15:55 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-15 16:15:55 +0300 |
| commit | df1c88b652e6977491b7f2b019c326518ccdc320 (patch) | |
| tree | d3cfdaef8f3ea0744f5f666679dadc6425501711 /source/blender/bmesh/tools/bmesh_decimate_collapse.c | |
| parent | 2589f55a55bc9682111ab266bb89d8f08713f374 (diff) | |
| parent | ccdacf1c9b31b15e188aa9e9adb044ffd0ca0da4 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/bmesh/tools/bmesh_decimate_collapse.c')
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_decimate_collapse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.c b/source/blender/bmesh/tools/bmesh_decimate_collapse.c index 0a1271c2aa9..3aa9e5278bc 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c +++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c @@ -1357,7 +1357,7 @@ void BM_mesh_decimate_collapse( (BLI_heap_node_value(BLI_heap_top(eheap)) != COST_INVALID)) { // const float value = BLI_heap_node_value(BLI_heap_top(eheap)); - BMEdge *e = BLI_heap_popmin(eheap); + BMEdge *e = BLI_heap_pop_min(eheap); float optimize_co[3]; BLI_assert(BM_elem_index_get(e) < tot_edge_orig); /* handy to detect corruptions elsewhere */ @@ -1388,7 +1388,7 @@ void BM_mesh_decimate_collapse( * - edges sharing a vertex are ignored, so the pivot vertex isnt moved to one side. */ - BMEdge *e = BLI_heap_popmin(eheap); + BMEdge *e = BLI_heap_pop_min(eheap); const int e_index = BM_elem_index_get(e); const int e_index_mirr = edge_symmetry_map[e_index]; BMEdge *e_mirr = NULL; |