Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2016-06-01 16:07:52 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-06-01 16:08:40 +0300
commit8cf8679b53e3aabb325301739d79ee1440977053 (patch)
tree582304938b951333e8d30381c87379fbddf52a3d /source/blender/blenlib/intern/BLI_ghash.c
parent543c64ef74d87e8f824a3b12d9c1e1b548407c0e (diff)
Revert "Correct invalid pointer-pair compare check"
This reverts commit d5e0e681cea846facb4f2777921f6612be3ee193. Tsk, these functions return false on a match.
Diffstat (limited to 'source/blender/blenlib/intern/BLI_ghash.c')
-rw-r--r--source/blender/blenlib/intern/BLI_ghash.c2
1 files changed, 1 insertions, 1 deletions
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));
}