Commit: 55812e3acd625aa93162cd9e0894efd43a1dd615
Author: Campbell Barton
Date: Tue Dec 9 00:13:35 2014 +0100
Branches: master
https://developer.blender.org/rB55812e3acd625aa93162cd9e0894efd43a1dd615
Cleanup: simplify heap popmin
===================================================================
M source/blender/blenlib/intern/BLI_heap.c
===================================================================
diff --git a/source/blender/blenlib/intern/BLI_heap.c
b/source/blender/blenlib/intern/BLI_heap.c
index 1e616d1..05bd107 100644
--- a/source/blender/blenlib/intern/BLI_heap.c
+++ b/source/blender/blenlib/intern/BLI_heap.c
@@ -205,13 +205,8 @@ void *BLI_heap_popmin(Heap *heap)
heap->tree[0]->ptr = heap->freenodes;
heap->freenodes = heap->tree[0];
- if (UNLIKELY(heap->size == 1)) {
- heap->size--;
- }
- else {
- heap_swap(heap, 0, heap->size - 1);
- heap->size--;
-
+ if (--heap->size) {
+ heap_swap(heap, 0, heap->size);
heap_down(heap, 0);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
