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/blenkernel/intern/curve_decimate.c | |
| parent | 2589f55a55bc9682111ab266bb89d8f08713f374 (diff) | |
| parent | ccdacf1c9b31b15e188aa9e9adb044ffd0ca0da4 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/curve_decimate.c')
| -rw-r--r-- | source/blender/blenkernel/intern/curve_decimate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/curve_decimate.c b/source/blender/blenkernel/intern/curve_decimate.c index 7983c63c99d..1a6c4714afd 100644 --- a/source/blender/blenkernel/intern/curve_decimate.c +++ b/source/blender/blenkernel/intern/curve_decimate.c @@ -159,7 +159,7 @@ static void curve_decimate( struct Knot *k; { - struct Removal *r = BLI_heap_popmin(heap); + struct Removal *r = BLI_heap_pop_min(heap); k = &knots[r->knot_index]; k->heap_node = NULL; k->prev->handles[1] = r->handles[0]; |