[Bf-blender-cvs] [03760fe] master: Cleanup: remove unused pointer in Heap

Campbell Barton noreply at git.blender.org
Tue Dec 9 00:02:54 CET 2014


Commit: 03760fed0d433568b1dc6e46fb7b48c59a3300b5
Author: Campbell Barton
Date:   Tue Dec 9 00:02:18 2014 +0100
Branches: master
https://developer.blender.org/rB03760fed0d433568b1dc6e46fb7b48c59a3300b5

Cleanup: remove unused pointer in Heap

===================================================================

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 55dee4e..1e616d1 100644
--- a/source/blender/blenlib/intern/BLI_heap.c
+++ b/source/blender/blenlib/intern/BLI_heap.c
@@ -49,7 +49,6 @@ struct Heap {
 	unsigned int bufsize;
 	MemArena *arena;
 	HeapNode *freenodes;
-	HeapNode *nodes;
 	HeapNode **tree;
 };
 
@@ -163,7 +162,7 @@ HeapNode *BLI_heap_insert(Heap *heap, float value, void *ptr)
 
 	if (heap->freenodes) {
 		node = heap->freenodes;
-		heap->freenodes = (HeapNode *)(((HeapNode *)heap->freenodes)->ptr);
+		heap->freenodes = heap->freenodes->ptr;
 	}
 	else {
 		node = (HeapNode *)BLI_memarena_alloc(heap->arena, sizeof(*node));




More information about the Bf-blender-cvs mailing list