add assert for hashes if an existing element is ever inserted into a ghash/edgehash.

the outliner does this intentionally, so add a flag to allow this situation optionally.

1 files changed, 14 insertions, 1 deletions

diff --git a/source/blender/blenlib/intern/edgehash.c b/source/blender/blenlib/intern/edgehash.c
index a3360921ee4..d3ce9bb4857 100644
--- a/source/blender/blenlib/intern/edgehash.c
+++ b/source/blender/blenlib/intern/edgehash.c
@@ -76,7 +76,8 @@ struct EdgeEntry {
 struct EdgeHash {
 	EdgeEntry **buckets;
 	BLI_mempool *epool;
-	unsigned int nbuckets, nentries, cursize;
+	unsigned int nbuckets, nentries;
+	unsigned short cursize, flag;
 };
 
 /***/
@@ -100,6 +101,8 @@ void BLI_edgehash_insert(EdgeHash *eh, unsigned int v0, unsigned int v1, void *v
 	unsigned int hash;
 	EdgeEntry *e = BLI_mempool_alloc(eh->epool);
 
+	BLI_assert((eh->flag & EDGEHASH_FLAG_ALLOW_DUPES) || (BLI_edgehash_haskey(eh, v0, v1) == 0));
+
 	/* this helps to track down errors with bad edge data */
 	BLI_assert(v0 != v1);
 
@@ -199,6 +202,16 @@ void BLI_edgehash_free(EdgeHash *eh, EdgeHashFreeFP valfreefp)
 }
 
 
+void BLI_edgehash_flag_set(EdgeHash *eh, unsigned short flag)
+{
+	eh->flag |= flag;
+}
+
+void BLI_edgehash_flag_clear(EdgeHash *eh, unsigned short flag)
+{
+	eh->flag &= (unsigned short)~flag;
+}
+
 /***/
 
 struct EdgeHashIterator {