[Bf-blender-cvs] [3a829396bb9] temp-geometry-nodes-distribute-points-cleanup: Silence warnings in cyHeap.h

Dalai Felinto noreply at git.blender.org
Fri Dec 11 12:32:50 CET 2020


Commit: 3a829396bb9fde9f05ee393d5d3559709a489c3a
Author: Dalai Felinto
Date:   Fri Dec 11 12:08:53 2020 +0100
Branches: temp-geometry-nodes-distribute-points-cleanup
https://developer.blender.org/rB3a829396bb9fde9f05ee393d5d3559709a489c3a

Silence warnings in cyHeap.h

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

M	source/blender/nodes/geometry/nodes/cyHeap.h

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

diff --git a/source/blender/nodes/geometry/nodes/cyHeap.h b/source/blender/nodes/geometry/nodes/cyHeap.h
index 265c29b9e4b..3a43f9b1169 100644
--- a/source/blender/nodes/geometry/nodes/cyHeap.h
+++ b/source/blender/nodes/geometry/nodes/cyHeap.h
@@ -253,11 +253,11 @@ class Heap {
   //////////////////////////////////////////////////////////////////////////!//!//!
   //!@name Internal structures and methods
 
+  size_t size;           // The total item count, including the ones removed from the heap.
+  size_t heapItemCount;  // The number of items in the heap.
   float *data;           // The main data pointer.
   size_t *heap;          // The heap array, keeping the id of each data item.
   size_t *heapPos;       // The heap position of each item.
-  size_t heapItemCount;  // The number of items in the heap.
-  size_t size;           // The total item count, including the ones removed from the heap.
   bool deleteData;       // Determines whether the data pointer owns the memory it points to.
 
   // Clears the data pointer and deallocates memory if the data is owned.



More information about the Bf-blender-cvs mailing list