[Bf-blender-cvs] [d8163a0] master: Fix for non-bool return values of a few common RNA functions with declared boolean return.

[Lukas Tönne]

Commit: d8163a08fb62903257878ae1bdbb3c0ba5b8e773
Author: Lukas Tönne
Date:   Mon Feb 8 10:13:09 2016 +0100
Branches: master
https://developer.blender.org/rBd8163a08fb62903257878ae1bdbb3c0ba5b8e773

Fix for non-bool return values of a few common RNA functions with declared 
boolean return.

Since rBbbc7dc169dc365889bad3f3aed7b868efb432710 bool-valued RNA functions are 
expected to
return only 0 or 1. For flag tests as in these functions the returned int value 
needs to be
explicitly converted to bool.

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

M       source/blender/makesrna/intern/rna_rna.c

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

diff --git a/source/blender/makesrna/intern/rna_rna.c 
b/source/blender/makesrna/intern/rna_rna.c
index 978738b..382258f 100644
--- a/source/blender/makesrna/intern/rna_rna.c
+++ b/source/blender/makesrna/intern/rna_rna.c
@@ -952,13 +952,13 @@ static void 
rna_Function_parameters_begin(CollectionPropertyIterator *iter, Poin
 static int rna_Function_registered_get(PointerRNA *ptr)
 {
        FunctionRNA *func = (FunctionRNA *)ptr->data;
-       return func->flag & FUNC_REGISTER;
+       return 0 != (func->flag & FUNC_REGISTER);
 }
 
 static int rna_Function_registered_optional_get(PointerRNA *ptr)
 {
        FunctionRNA *func = (FunctionRNA *)ptr->data;
-       return func->flag & (FUNC_REGISTER_OPTIONAL & ~FUNC_REGISTER);
+       return 0 != (func->flag & (FUNC_REGISTER_OPTIONAL & ~FUNC_REGISTER));
 }
 
 static int rna_Function_no_self_get(PointerRNA *ptr)
@@ -970,7 +970,7 @@ static int rna_Function_no_self_get(PointerRNA *ptr)
 static int rna_Function_use_self_type_get(PointerRNA *ptr)
 {
        FunctionRNA *func = (FunctionRNA *)ptr->data;
-       return (func->flag & FUNC_USE_SELF_TYPE);
+       return 0 != (func->flag & FUNC_USE_SELF_TYPE);
 }
 
 /* Blender RNA */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs