[Bf-blender-cvs] [4e5ee5b] master: Fix own error in recent heap update

Campbell Barton noreply at git.blender.org
Wed Jul 20 16:30:04 CEST 2016


Commit: 4e5ee5b75e19b24eeceee489f2958e9000d0f2fb
Author: Campbell Barton
Date:   Thu Jul 21 00:33:37 2016 +1000
Branches: master
https://developer.blender.org/rB4e5ee5b75e19b24eeceee489f2958e9000d0f2fb

Fix own error in recent heap update

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

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 d48e9fb..0a8dafc 100644
--- a/source/blender/blenlib/intern/BLI_heap.c
+++ b/source/blender/blenlib/intern/BLI_heap.c
@@ -167,8 +167,7 @@ static struct HeapNode *heap_node_alloc(Heap *heap)
 	else {
 		struct HeapNode_Chunk *chunk = heap->nodes.chunk;
 		if (UNLIKELY(chunk->size == chunk->bufsize)) {
-			struct HeapNode_Chunk *chunk_next = heap_node_alloc_chunk(HEAP_CHUNK_DEFAULT_NUM, chunk);
-			chunk = chunk_next;
+			chunk = heap->nodes.chunk = heap_node_alloc_chunk(HEAP_CHUNK_DEFAULT_NUM, chunk);
 		}
 		node = &chunk->buf[chunk->size++];
 	}




More information about the Bf-blender-cvs mailing list