Commit: 8cf8679b53e3aabb325301739d79ee1440977053
Author: Campbell Barton
Date: Wed Jun 1 23:07:52 2016 +1000
Branches: master
https://developer.blender.org/rB8cf8679b53e3aabb325301739d79ee1440977053
Revert "Correct invalid pointer-pair compare check"
This reverts commit d5e0e681cea846facb4f2777921f6612be3ee193.
Tsk, these functions return false on a match.
===================================================================
M source/blender/blenlib/intern/BLI_ghash.c
===================================================================
diff --git a/source/blender/blenlib/intern/BLI_ghash.c
b/source/blender/blenlib/intern/BLI_ghash.c
index 0b5adab..857ce1a 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));
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
