sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: simplify heap popmin

Browse Source
This commit is contained in:
Campbell Barton 2014-12-09 00:13:35 +01:00
parent 03760fed0d
commit 55812e3acd
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenlib/intern/BLI_heap.c
View File

@ -205,13 +205,8 @@ void *BLI_heap_popmin(Heap *heap)
heap->tree[0]->ptr = heap->freenodes; heap->tree[0]->ptr = heap->freenodes;
heap->freenodes = heap->tree[0]; heap->freenodes = heap->tree[0];
if (UNLIKELY(heap->size == 1)) { if (--heap->size) {
heap->size--; heap_swap(heap, 0, heap->size);
}
else {
heap_swap(heap, 0, heap->size - 1);
heap->size--;
heap_down(heap, 0); heap_down(heap, 0);
} }