[Bf-blender-cvs] [34a7156] master: RNA assert: make object game state to comply with RNA_property_boolean_get_index() 1/0 requirement
Dalai Felinto
noreply at git.blender.org
Mon Jul 13 20:52:34 CEST 2015
Commit: 34a7156705c98e8b146f5e051981a7355ff719dd
Author: Dalai Felinto
Date: Mon Jul 13 15:51:31 2015 -0300
Branches: master
https://developer.blender.org/rB34a7156705c98e8b146f5e051981a7355ff719dd
RNA assert: make object game state to comply with RNA_property_boolean_get_index() 1/0 requirement
===================================================================
M source/blender/makesrna/intern/rna_object.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index de39c7b..67243d4 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -1134,7 +1134,7 @@ static void rna_GameObjectSettings_state_get(PointerRNA *ptr, int *values)
memset(values, 0, sizeof(int) * OB_MAX_STATES);
for (i = 0; i < OB_MAX_STATES; i++) {
- values[i] = (ob->state & (1 << i)) | all_states;
+ values[i] = (ob->state & (1 << i)) ? 1 : 0 | all_states;
}
}
More information about the Bf-blender-cvs
mailing list