[Bf-blender-cvs] [14720e2] master: Cleanup: Use bool

[Julian Eisel]

Commit: 14720e2e6265efdcdfe9971226d33db51e477970
Author: Julian Eisel
Date:   Thu Aug 4 03:10:28 2016 +0200
Branches: master
https://developer.blender.org/rB14720e2e6265efdcdfe9971226d33db51e477970

Cleanup: Use bool

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

M       source/blender/editors/screen/screen_context.c

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

diff --git a/source/blender/editors/screen/screen_context.c 
b/source/blender/editors/screen/screen_context.c
index 22d95d7..5da4a77 100644
--- a/source/blender/editors/screen/screen_context.c
+++ b/source/blender/editors/screen/screen_context.c
@@ -117,7 +117,7 @@ int ed_screen_context(const bContext *C, const char 
*member, bContextDataResult
        }
        else if (CTX_data_equals(member, "visible_objects") || 
CTX_data_equals(member, "visible_bases")) {
                const unsigned int lay = context_layers(sc, scene, sa);
-               int visible_objects = CTX_data_equals(member, 
"visible_objects");
+               const bool visible_objects = CTX_data_equals(member, 
"visible_objects");
 
                for (base = scene->base.first; base; base = base->next) {
                        if (((base->object->restrictflag & OB_RESTRICT_VIEW) == 
0) && (base->lay & lay)) {
@@ -132,7 +132,7 @@ int ed_screen_context(const bContext *C, const char 
*member, bContextDataResult
        }
        else if (CTX_data_equals(member, "selectable_objects") || 
CTX_data_equals(member, "selectable_bases")) {
                const unsigned int lay = context_layers(sc, scene, sa);
-               int selectable_objects = CTX_data_equals(member, 
"selectable_objects");
+               const bool selectable_objects = CTX_data_equals(member, 
"selectable_objects");
 
                for (base = scene->base.first; base; base = base->next) {
                        if (base->lay & lay) {
@@ -149,7 +149,7 @@ int ed_screen_context(const bContext *C, const char 
*member, bContextDataResult
        }
        else if (CTX_data_equals(member, "selected_objects") || 
CTX_data_equals(member, "selected_bases")) {
                const unsigned int lay = context_layers(sc, scene, sa);
-               int selected_objects = CTX_data_equals(member, 
"selected_objects");
+               const bool selected_objects = CTX_data_equals(member, 
"selected_objects");
 
                for (base = scene->base.first; base; base = base->next) {
                        if ((base->flag & SELECT) && (base->lay & lay)) {
@@ -164,7 +164,7 @@ int ed_screen_context(const bContext *C, const char 
*member, bContextDataResult
        }
        else if (CTX_data_equals(member, "selected_editable_objects") || 
CTX_data_equals(member, "selected_editable_bases")) {
                const unsigned int lay = context_layers(sc, scene, sa);
-               int selected_editable_objects = CTX_data_equals(member, 
"selected_editable_objects");
+               const bool selected_editable_objects = CTX_data_equals(member, 
"selected_editable_objects");
 
                for (base = scene->base.first; base; base = base->next) {
                        if ((base->flag & SELECT) && (base->lay & lay)) {
@@ -183,7 +183,7 @@ int ed_screen_context(const bContext *C, const char 
*member, bContextDataResult
        }
        else if (CTX_data_equals(member, "editable_objects") || 
CTX_data_equals(member, "editable_bases")) {
                const unsigned int lay = context_layers(sc, scene, sa);
-               int editable_objects = CTX_data_equals(member, 
"editable_objects");
+               const bool editable_objects = CTX_data_equals(member, 
"editable_objects");
                
                /* Visible + Editable, but not necessarily selected */
                for (base = scene->base.first; base; base = base->next) {
@@ -202,7 +202,7 @@ int ed_screen_context(const bContext *C, const char 
*member, bContextDataResult
        else if (CTX_data_equals(member, "visible_bones") || 
CTX_data_equals(member, "editable_bones")) {
                bArmature *arm = (obedit && obedit->type == OB_ARMATURE) ? 
obedit->data : NULL;
                EditBone *ebone, *flipbone = NULL;
-               int editable_bones = CTX_data_equals(member, "editable_bones");
+               const bool editable_bones = CTX_data_equals(member, 
"editable_bones");
                
                if (arm && arm->edbo) {
                        /* Attention: X-Axis Mirroring is also handled here... 
*/
@@ -244,7 +244,7 @@ int ed_screen_context(const bContext *C, const char 
*member, bContextDataResult
        else if (CTX_data_equals(member, "selected_bones") || 
CTX_data_equals(member, "selected_editable_bones")) {
                bArmature *arm = (obedit && obedit->type == OB_ARMATURE) ? 
obedit->data : NULL;
                EditBone *ebone, *flipbone = NULL;
-               int selected_editable_bones = CTX_data_equals(member, 
"selected_editable_bones");
+               const bool selected_editable_bones = CTX_data_equals(member, 
"selected_editable_bones");
                
                if (arm && arm->edbo) {
                        /* Attention: X-Axis Mirroring is also handled here... 
*/

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