diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2018-04-15 13:16:55 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2018-04-15 13:16:55 +0300 |
| commit | 7e1832c8d546ec13e752b7bd42ce13e3fc10ae86 (patch) | |
| tree | 0fff9d878db69b288f909ff9a0f8aefe31ab8d80 /source/blender/bmesh/tools/bmesh_beautify.c | |
| parent | c0c8df3f2cf3ab03cec1f660619b0fe2290caf2a (diff) | |
| parent | 94959dba1b53640e2a36cf9b5ca46aaf49c5c74a (diff) | |
Merge branch 'blender2.8' into hair_guides
Diffstat (limited to 'source/blender/bmesh/tools/bmesh_beautify.c')
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_beautify.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/bmesh/tools/bmesh_beautify.c b/source/blender/bmesh/tools/bmesh_beautify.c index 6e6242fc9f9..d3972363bb4 100644 --- a/source/blender/bmesh/tools/bmesh_beautify.c +++ b/source/blender/bmesh/tools/bmesh_beautify.c @@ -37,7 +37,7 @@ #include "BLI_math.h" #include "BLI_heap.h" -#include "BLI_polyfill2d_beautify.h" +#include "BLI_polyfill_2d_beautify.h" #include "MEM_guardedalloc.h" @@ -392,7 +392,7 @@ void BM_mesh_beautify_fill( bm->elem_index_dirty |= BM_EDGE; while (BLI_heap_is_empty(eheap) == false) { - BMEdge *e = BLI_heap_popmin(eheap); + BMEdge *e = BLI_heap_pop_min(eheap); i = BM_elem_index_get(e); eheap_table[i] = NULL; |