Commit: 34abb614f1344a63b1c1411bb891c98bd93fb2a2
Author: Sergey Sharybin
Date:   Thu Sep 25 17:00:07 2014 +0600
Branches: master
https://developer.blender.org/rB34abb614f1344a63b1c1411bb891c98bd93fb2a2

Fix ghash comparator used by translation

It now need to return bool whether element matched or not.

===================================================================

M       source/blender/python/intern/bpy_app_translations.c

===================================================================

diff --git a/source/blender/python/intern/bpy_app_translations.c 
b/source/blender/python/intern/bpy_app_translations.c
index 109e560..72ae7bb 100644
--- a/source/blender/python/intern/bpy_app_translations.c
+++ b/source/blender/python/intern/bpy_app_translations.c
@@ -86,7 +86,7 @@ static unsigned int _ghashutil_keyhash(const void *ptr)
        return hash ^ BLI_ghashutil_strhash(key->msgid);
 }
 
-static int _ghashutil_keycmp(const void *a, const void *b)
+static bool _ghashutil_keycmp(const void *a, const void *b)
 {
        const GHashKey *A = a;
        const GHashKey *B = b;
@@ -94,8 +94,8 @@ static int _ghashutil_keycmp(const void *a, const void *b)
        /* Note: comparing msgid first, most of the time it will be enough! */
        int cmp = BLI_ghashutil_strcmp(A->msgid, B->msgid);
        if (cmp == 0)
-               return BLI_ghashutil_strcmp(A->msgctxt, B->msgctxt);
-       return cmp;
+               return BLI_ghashutil_strcmp(A->msgctxt, B->msgctxt) == 0;
+       return false;
 }
 
 static void _ghashutil_keyfree(void *ptr)

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to