Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-01-04 10:16:19 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-01-04 11:10:01 +0400
commitb9114cb609698bdd40175b79c017b8ec8d10b518 (patch)
tree98dc331711dcd06fb69f905ebdaf7937a4d23379 /source/blender/editors/interface/interface_eyedropper.c
parent091740f858c1b6d3016e38fc3186cce737d9ff2c (diff)
UI: Use bool rather then int/short's where possible
Diffstat (limited to 'source/blender/editors/interface/interface_eyedropper.c')
-rw-r--r--source/blender/editors/interface/interface_eyedropper.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/interface/interface_eyedropper.c b/source/blender/editors/interface/interface_eyedropper.c
index a01c7eecda1..023a0cd6fcb 100644
--- a/source/blender/editors/interface/interface_eyedropper.c
+++ b/source/blender/editors/interface/interface_eyedropper.c
@@ -79,12 +79,12 @@ typedef struct Eyedropper {
PropertyRNA *prop;
int index;
- int accum_start; /* has mouse been presed */
+ bool accum_start; /* has mouse been presed */
float accum_col[3];
int accum_tot;
} Eyedropper;
-static int eyedropper_init(bContext *C, wmOperator *op)
+static bool eyedropper_init(bContext *C, wmOperator *op)
{
Scene *scene = CTX_data_scene(C);
Eyedropper *eye;
@@ -95,11 +95,11 @@ static int eyedropper_init(bContext *C, wmOperator *op)
if ((eye->ptr.data == NULL) ||
(eye->prop == NULL) ||
- (RNA_property_editable(&eye->ptr, eye->prop) == FALSE) ||
+ (RNA_property_editable(&eye->ptr, eye->prop) == false) ||
(RNA_property_array_length(&eye->ptr, eye->prop) < 3) ||
(RNA_property_type(eye->prop) != PROP_FLOAT))
{
- return FALSE;
+ return false;
}
if (RNA_property_subtype(eye->prop) == PROP_COLOR) {
@@ -109,7 +109,7 @@ static int eyedropper_init(bContext *C, wmOperator *op)
eye->display = IMB_colormanagement_display_get_named(display_device);
}
- return TRUE;
+ return true;
}
static void eyedropper_exit(bContext *C, wmOperator *op)
@@ -257,7 +257,7 @@ static int eyedropper_modal(bContext *C, wmOperator *op, const wmEvent *event)
}
else if (event->val == KM_PRESS) {
/* enable accum and make first sample */
- eye->accum_start = TRUE;
+ eye->accum_start = true;
eyedropper_color_sample_accum(C, eye, event->x, event->y);
}
break;