[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59371] trunk/blender/source/blender/ blenlib/intern: ghash/edgehash flag wasn't being initialized for new hashes .

[Campbell Barton]

Revision: 59371
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59371
Author:   campbellbarton
Date:     2013-08-21 20:21:42 +0000 (Wed, 21 Aug 2013)
Log Message:
-----------
ghash/edgehash flag wasn't being initialized for new hashes. also init vars in same order for ghash/edgehash.

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
    trunk/blender/source/blender/blenlib/intern/edgehash.c

Modified: trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_ghash.c	2013-08-21 16:06:03 UTC (rev 59370)
+++ trunk/blender/source/blender/blenlib/intern/BLI_ghash.c	2013-08-21 20:21:42 UTC (rev 59371)
@@ -150,15 +150,17 @@
 GHash *BLI_ghash_new(GHashHashFP hashfp, GHashCmpFP cmpfp, const char *info)
 {
 	GHash *gh = MEM_mallocN(sizeof(*gh), info);
+
 	gh->hashfp = hashfp;
 	gh->cmpfp = cmpfp;
-	gh->entrypool = BLI_mempool_create(sizeof(Entry), 64, 64, 0);
 
+	gh->nbuckets = hashsizes[0];  /* gh->cursize */
+	gh->nentries = 0;
 	gh->cursize = 0;
-	gh->nentries = 0;
-	gh->nbuckets = hashsizes[gh->cursize];
+	gh->flag = 0;
 
 	gh->buckets = MEM_callocN(gh->nbuckets * sizeof(*gh->buckets), "buckets");
+	gh->entrypool = BLI_mempool_create(sizeof(Entry), 64, 64, 0);
 
 	return gh;
 }

Modified: trunk/blender/source/blender/blenlib/intern/edgehash.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/edgehash.c	2013-08-21 16:06:03 UTC (rev 59370)
+++ trunk/blender/source/blender/blenlib/intern/edgehash.c	2013-08-21 20:21:42 UTC (rev 59371)
@@ -160,9 +160,11 @@
 EdgeHash *BLI_edgehash_new(void)
 {
 	EdgeHash *eh = MEM_callocN(sizeof(*eh), "EdgeHash");
+
+	eh->nbuckets = _ehash_hashsizes[0];  /* eh->cursize */
+	eh->nentries = 0;
 	eh->cursize = 0;
-	eh->nentries = 0;
-	eh->nbuckets = _ehash_hashsizes[eh->cursize];
+	eh->flag = 0;
 
 	eh->buckets = MEM_callocN(eh->nbuckets * sizeof(*eh->buckets), "eh buckets 2");
 	eh->epool = BLI_mempool_create(sizeof(EdgeEntry), 512, 512, BLI_MEMPOOL_SYSMALLOC);