From 8cf8679b53e3aabb325301739d79ee1440977053 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 1 Jun 2016 23:07:52 +1000 Subject: Revert "Correct invalid pointer-pair compare check" This reverts commit d5e0e681cea846facb4f2777921f6612be3ee193. Tsk, these functions return false on a match. --- source/blender/blenlib/intern/BLI_ghash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source') diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c index 0b5adab3929..857ce1adef2 100644 --- a/source/blender/blenlib/intern/BLI_ghash.c +++ b/source/blender/blenlib/intern/BLI_ghash.c @@ -1287,7 +1287,7 @@ bool BLI_ghashutil_paircmp(const void *a, const void *b) const GHashPair *A = a; const GHashPair *B = b; - return (BLI_ghashutil_ptrcmp(A->first, B->first) && + return (BLI_ghashutil_ptrcmp(A->first, B->first) || BLI_ghashutil_ptrcmp(A->second, B->second)); } -- cgit v1.2.3