From 5e4f789173bb998f85a942a6a02cd30cb42f7660 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 31 Mar 2014 15:23:27 +0600 Subject: Code cleanup: use false/true/bool for masking --- source/blender/blenkernel/BKE_mask.h | 14 +++++++------- source/blender/blenkernel/intern/mask.c | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_mask.h b/source/blender/blenkernel/BKE_mask.h index 5dd0b14be63..3db4d9e7324 100644 --- a/source/blender/blenkernel/BKE_mask.h +++ b/source/blender/blenkernel/BKE_mask.h @@ -188,15 +188,15 @@ void BKE_mask_clipboard_copy_from_layer(struct MaskLayer *mask_layer); bool BKE_mask_clipboard_is_empty(void); void BKE_mask_clipboard_paste_to_layer(struct Main *bmain, struct MaskLayer *mask_layer); -#define MASKPOINT_ISSEL_ANY(p) ( ((p)->bezt.f1 | (p)->bezt.f2 | (p)->bezt.f3) & SELECT) -#define MASKPOINT_ISSEL_KNOT(p) ( (p)->bezt.f2 & SELECT) +#define MASKPOINT_ISSEL_ANY(p) (( ((p)->bezt.f1 | (p)->bezt.f2 | (p)->bezt.f3) & SELECT) != 0) +#define MASKPOINT_ISSEL_KNOT(p) (( (p)->bezt.f2 & SELECT) != 0) #define MASKPOINT_ISSEL_HANDLE(point, which_handle) \ - ((which_handle == MASK_WHICH_HANDLE_STICK) ? \ - ((((point)->bezt.f1 | (point)->bezt.f3) & SELECT)) : \ - ((which_handle == MASK_WHICH_HANDLE_LEFT) ? \ - ((point)->bezt.f1 & SELECT) : \ - ((point)->bezt.f3 & SELECT))) + (((which_handle == MASK_WHICH_HANDLE_STICK) ? \ + ((((point)->bezt.f1 | (point)->bezt.f3) & SELECT)) : \ + ((which_handle == MASK_WHICH_HANDLE_LEFT) ? \ + ((point)->bezt.f1 & SELECT) : \ + ((point)->bezt.f3 & SELECT))) != 0) #define MASKPOINT_SEL_ALL(p) { (p)->bezt.f1 |= SELECT; (p)->bezt.f2 |= SELECT; (p)->bezt.f3 |= SELECT; } (void)0 #define MASKPOINT_DESEL_ALL(p) { (p)->bezt.f1 &= ~SELECT; (p)->bezt.f2 &= ~SELECT; (p)->bezt.f3 &= ~SELECT; } (void)0 diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c index 8ea035e3249..b303243b66a 100644 --- a/source/blender/blenkernel/intern/mask.c +++ b/source/blender/blenkernel/intern/mask.c @@ -263,7 +263,7 @@ MaskSpline *BKE_mask_spline_add(MaskLayer *masklay) bool BKE_mask_spline_remove(MaskLayer *mask_layer, MaskSpline *spline) { - if (BLI_remlink_safe(&mask_layer->splines, spline) == FALSE) { + if (BLI_remlink_safe(&mask_layer->splines, spline) == false) { return false; } @@ -1402,7 +1402,7 @@ void BKE_mask_calc_handle_point_auto(MaskSpline *spline, MaskSplinePoint *point, point->bezt.h2 = h_back[1]; /* preserve length by applying it back */ - if (do_recalc_length == FALSE) { + if (do_recalc_length == false) { dist_ensure_v2_v2fl(point->bezt.vec[0], point->bezt.vec[1], length_average); dist_ensure_v2_v2fl(point->bezt.vec[2], point->bezt.vec[1], length_average); } @@ -1489,7 +1489,7 @@ void BKE_mask_layer_evaluate(MaskLayer *masklay, const float ctime, const bool d for (spline = masklay->splines.first; spline; spline = spline->next) { int i; - int need_handle_recalc = FALSE; + bool need_handle_recalc = false; BKE_mask_spline_ensure_deform(spline); @@ -1505,7 +1505,7 @@ void BKE_mask_layer_evaluate(MaskLayer *masklay, const float ctime, const bool d mask_evaluate_apply_point_parent(point_deform, ctime); if (ELEM(point->bezt.h1, HD_AUTO, HD_VECT)) { - need_handle_recalc = TRUE; + need_handle_recalc = true; } } -- cgit v1.2.3