[Bf-blender-cvs] [d36429b] master: initialize members in-order
Campbell Barton
noreply at git.blender.org
Tue Apr 14 11:00:10 CEST 2015
Commit: d36429b9307db13628701831cf84d2f3fb147ab0
Author: Campbell Barton
Date: Tue Apr 14 18:24:40 2015 +1000
Branches: master
https://developer.blender.org/rBd36429b9307db13628701831cf84d2f3fb147ab0
initialize members in-order
===================================================================
M source/blender/blenlib/intern/BLI_heap.c
M source/blender/bmesh/intern/bmesh_core.c
===================================================================
diff --git a/source/blender/blenlib/intern/BLI_heap.c b/source/blender/blenlib/intern/BLI_heap.c
index 66dfa87..c0f338a 100644
--- a/source/blender/blenlib/intern/BLI_heap.c
+++ b/source/blender/blenlib/intern/BLI_heap.c
@@ -183,8 +183,8 @@ HeapNode *BLI_heap_insert(Heap *heap, float value, void *ptr)
node = (HeapNode *)BLI_memarena_alloc(heap->arena, sizeof(*node));
}
- node->value = value;
node->ptr = ptr;
+ node->value = value;
node->index = heap->size;
heap->tree[node->index] = node;
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c
index ad35f6e..dc5e5a5 100644
--- a/source/blender/bmesh/intern/bmesh_core.c
+++ b/source/blender/bmesh/intern/bmesh_core.c
@@ -213,8 +213,8 @@ static BMLoop *bm_loop_create(BMesh *bm, BMVert *v, BMEdge *e, BMFace *f,
BM_elem_index_set(l, -1); /* set_ok_invalid */
#endif
- l->head.hflag = 0;
l->head.htype = BM_LOOP;
+ l->head.hflag = 0;
l->head.api_flag = 0;
l->v = v;
More information about the Bf-blender-cvs
mailing list