diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-06-01 16:07:52 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2016-06-08 22:45:40 +0300 |
| commit | 6d94d6ddc75ad22a8dfd582fcafdf982152de357 (patch) | |
| tree | a508be267ca6e04dc32b0079ce1081e844fd5b6e | |
| parent | 2777fd03f801788d9323ebfee7d1ec8213b334e7 (diff) | |
Revert "Correct invalid pointer-pair compare check"
This reverts commit d5e0e681cea846facb4f2777921f6612be3ee193.
Tsk, these functions return false on a match.
| -rw-r--r-- | source/blender/blenlib/intern/BLI_ghash.c | 2 |
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)); } |