diff options
author | Jacques Lucke <jacques@blender.org> | 2020-09-02 20:10:18 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-09-02 20:10:40 +0300 |
commit | f5e55c33378b96e614710006121860eb880e6820 (patch) | |
tree | 4f24b19e6b5e187d9b7b3d43f741c26f2c843fc8 /source/blender/editors/interface | |
parent | f20f82ce3ee55c12adcec024e0133e71183e07b3 (diff) |
Cleanup: use bool instead of int in various places
Diffstat (limited to 'source/blender/editors/interface')
6 files changed, 24 insertions, 24 deletions
diff --git a/source/blender/editors/interface/interface_eyedropper_datablock.c b/source/blender/editors/interface/interface_eyedropper_datablock.c index dd55d2c364b..6a12f550d7c 100644 --- a/source/blender/editors/interface/interface_eyedropper_datablock.c +++ b/source/blender/editors/interface/interface_eyedropper_datablock.c @@ -355,12 +355,12 @@ static bool datadropper_poll(bContext *C) StructRNA *type = RNA_property_pointer_type(&ptr, prop); const short idcode = RNA_type_to_ID_code(type); if ((idcode == ID_OB) || OB_DATA_SUPPORT_ID(idcode)) { - return 1; + return true; } } } - return 0; + return false; } void UI_OT_eyedropper_id(wmOperatorType *ot) diff --git a/source/blender/editors/interface/interface_eyedropper_depth.c b/source/blender/editors/interface/interface_eyedropper_depth.c index ac142fe7217..fbc0ed1fc1f 100644 --- a/source/blender/editors/interface/interface_eyedropper_depth.c +++ b/source/blender/editors/interface/interface_eyedropper_depth.c @@ -351,7 +351,7 @@ static bool depthdropper_poll(bContext *C) if ((RNA_property_type(prop) == PROP_FLOAT) && (RNA_property_subtype(prop) & PROP_UNIT_LENGTH) && (RNA_property_array_check(prop) == false)) { - return 1; + return true; } } else { @@ -359,12 +359,12 @@ static bool depthdropper_poll(bContext *C) if (rv3d && rv3d->persp == RV3D_CAMOB) { View3D *v3d = CTX_wm_view3d(C); if (v3d->camera && v3d->camera->data && !ID_IS_LINKED(v3d->camera->data)) { - return 1; + return true; } } } - return 0; + return false; } void UI_OT_eyedropper_depth(wmOperatorType *ot) diff --git a/source/blender/editors/interface/interface_eyedropper_driver.c b/source/blender/editors/interface/interface_eyedropper_driver.c index d13e47624ee..29c0368219b 100644 --- a/source/blender/editors/interface/interface_eyedropper_driver.c +++ b/source/blender/editors/interface/interface_eyedropper_driver.c @@ -207,9 +207,9 @@ static int driverdropper_exec(bContext *C, wmOperator *op) static bool driverdropper_poll(bContext *C) { if (!CTX_wm_window(C)) { - return 0; + return false; } - return 1; + return true; } void UI_OT_eyedropper_driver(wmOperatorType *ot) diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index bf88b3c0318..143ca6a0ef1 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -10988,11 +10988,11 @@ bool UI_but_active_drop_name(bContext *C) if (but) { if (ELEM(but->type, UI_BTYPE_TEXT, UI_BTYPE_SEARCH_MENU)) { - return 1; + return true; } } - return 0; + return false; } bool UI_but_active_drop_color(bContext *C) diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index d6919fb4de7..c9f21c7fc2e 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -91,11 +91,11 @@ static bool copy_data_path_button_poll(bContext *C) if (path) { MEM_freeN(path); - return 1; + return true; } } - return 0; + return false; } static int copy_data_path_button_exec(bContext *C, wmOperator *op) @@ -182,11 +182,11 @@ static bool copy_as_driver_button_poll(bContext *C) if (path) { MEM_freeN(path); - return 1; + return true; } } - return 0; + return false; } static int copy_as_driver_button_exec(bContext *C, wmOperator *op) diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index 7234e279da8..c6b29f79137 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -107,7 +107,7 @@ typedef struct v2dViewPanData { } v2dViewPanData; /* initialize panning customdata */ -static int view_pan_init(bContext *C, wmOperator *op) +static bool view_pan_init(bContext *C, wmOperator *op) { ARegion *region = CTX_wm_region(C); v2dViewPanData *vpd; @@ -116,13 +116,13 @@ static int view_pan_init(bContext *C, wmOperator *op) /* regions now have v2d-data by default, so check for region */ if (region == NULL) { - return 0; + return false; } /* check if panning is allowed at all */ v2d = ®ion->v2d; if ((v2d->keepofs & V2D_LOCKOFS_X) && (v2d->keepofs & V2D_LOCKOFS_Y)) { - return 0; + return false; } /* set custom-data for operator */ @@ -141,7 +141,7 @@ static int view_pan_init(bContext *C, wmOperator *op) vpd->facx = (BLI_rctf_size_x(&v2d->cur)) / winx; vpd->facy = (BLI_rctf_size_y(&v2d->cur)) / winy; - return 1; + return true; } #ifdef WITH_INPUT_NDOF @@ -152,17 +152,17 @@ static bool view_pan_poll(bContext *C) /* check if there's a region in context to work with */ if (region == NULL) { - return 0; + return false; } v2d = ®ion->v2d; /* check that 2d-view can pan */ if ((v2d->keepofs & V2D_LOCKOFS_X) && (v2d->keepofs & V2D_LOCKOFS_Y)) { - return 0; + return false; } /* view can pan */ - return 1; + return true; } #endif @@ -808,7 +808,7 @@ static void view_zoom_axis_lock_defaults(bContext *C, bool r_do_zoom_xy[2]) } /* initialize panning customdata */ -static int view_zoomdrag_init(bContext *C, wmOperator *op) +static bool view_zoomdrag_init(bContext *C, wmOperator *op) { ARegion *region = CTX_wm_region(C); v2dViewZoomData *vzd; @@ -816,13 +816,13 @@ static int view_zoomdrag_init(bContext *C, wmOperator *op) /* regions now have v2d-data by default, so check for region */ if (region == NULL) { - return 0; + return false; } v2d = ®ion->v2d; /* check that 2d-view is zoomable */ if ((v2d->keepzoom & V2D_LOCKZOOM_X) && (v2d->keepzoom & V2D_LOCKZOOM_Y)) { - return 0; + return false; } /* set custom-data for operator */ @@ -833,7 +833,7 @@ static int view_zoomdrag_init(bContext *C, wmOperator *op) vzd->v2d = v2d; vzd->region = region; - return 1; + return true; } /* check if step-zoom can be applied */ |