Code Cleanup: rename vars for detecting change to be more consistent

rename change/is_change/is_changed/modified -> changed
also use bools over int/short/char and once accidental float.

4 files changed, 64 insertions, 62 deletions

diff --git a/source/blender/editors/mask/mask_editaction.c b/source/blender/editors/mask/mask_editaction.c
index 5c76d464502..20d49e89771 100644
--- a/source/blender/editors/mask/mask_editaction.c
+++ b/source/blender/editors/mask/mask_editaction.c
@@ -210,7 +210,7 @@ void ED_masklayer_frames_select_border(MaskLayer *masklay, float min, float max,
 bool ED_masklayer_frames_delete(MaskLayer *masklay)
 {
 	MaskLayerShape *masklay_shape, *masklay_shape_next;
-	bool modified = false;
+	bool changed = false;
 
 	/* error checking */
 	if (masklay == NULL)
@@ -222,11 +222,11 @@ bool ED_masklayer_frames_delete(MaskLayer *masklay)
 
 		if (masklay_shape->flag & MASK_SHAPE_SELECT) {
 			BKE_mask_layer_shape_unlink(masklay, masklay_shape);
-			modified = true;
+			changed = true;
 		}
 	}
 
-	return modified;
+	return changed;
 }
 
 /* Duplicate selected frames from given mask-layer */
diff --git a/source/blender/editors/mask/mask_ops.c b/source/blender/editors/mask/mask_ops.c
index aea346b63a6..a4943373288 100644
--- a/source/blender/editors/mask/mask_ops.c
+++ b/source/blender/editors/mask/mask_ops.c
@@ -1073,12 +1073,12 @@ static int mask_switch_direction_exec(bContext *C, wmOperator *UNUSED(op))
 	Mask *mask = CTX_data_edit_mask(C);
 	MaskLayer *masklay;
 
-	int change = FALSE;
+	bool changed = false;
 
 	/* do actual selection */
 	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
 		MaskSpline *spline;
-		int change_layer = FALSE;
+		bool changed_layer = false;
 
 		if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
 			continue;
@@ -1087,19 +1087,19 @@ static int mask_switch_direction_exec(bContext *C, wmOperator *UNUSED(op))
 		for (spline = masklay->splines.first; spline; spline = spline->next) {
 			if (ED_mask_spline_select_check(spline)) {
 				BKE_mask_spline_direction_switch(masklay, spline);
-				change = TRUE;
-				change_layer = TRUE;
+				changed = true;
+				changed_layer = true;
 			}
 		}
 
-		if (change_layer) {
+		if (changed_layer) {
 			if (IS_AUTOKEY_ON(scene)) {
 				ED_mask_layer_shape_auto_key(masklay, CFRA);
 			}
 		}
 	}
 
-	if (change) {
+	if (changed) {
 		/* TODO: only update this spline */
 		BKE_mask_update_display(mask, CFRA);
 
@@ -1136,12 +1136,12 @@ static int mask_normals_make_consistent_exec(bContext *C, wmOperator *UNUSED(op)
 	MaskLayer *masklay;
 	int i;
 
-	int change = FALSE;
+	bool changed = false;
 
 	/* do actual selection */
 	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
 		MaskSpline *spline;
-		int change_layer = FALSE;
+		bool changed_layer = false;
 
 		if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
 			continue;
@@ -1153,20 +1153,20 @@ static int mask_normals_make_consistent_exec(bContext *C, wmOperator *UNUSED(op)
 
 				if (MASKPOINT_ISSEL_ANY(point)) {
 					BKE_mask_calc_handle_point_auto(spline, point, FALSE);
-					change = TRUE;
-					change_layer = TRUE;
+					changed = true;
+					changed_layer = true;
 				}
 			}
 		}
 
-		if (change_layer) {
+		if (changed_layer) {
 			if (IS_AUTOKEY_ON(scene)) {
 				ED_mask_layer_shape_auto_key(masklay, CFRA);
 			}
 		}
 	}
 
-	if (change) {
+	if (changed) {
 		/* TODO: only update this spline */
 		BKE_mask_update_display(mask, CFRA);
 
@@ -1204,7 +1204,7 @@ static int set_handle_type_exec(bContext *C, wmOperator *op)
 	MaskLayer *masklay;
 	int handle_type = RNA_enum_get(op->ptr, "type");
 
-	bool change = false;
+	bool changed = false;
 
 	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
 		MaskSpline *spline;
@@ -1222,13 +1222,13 @@ static int set_handle_type_exec(bContext *C, wmOperator *op)
 					BezTriple *bezt = &point->bezt;
 
 					bezt->h1 = bezt->h2 = handle_type;
-					change = true;
+					changed = true;
 				}
 			}
 		}
 	}
 
-	if (change) {
+	if (changed) {
 		WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
 		DAG_id_tag_update(&mask->id, 0);
 
@@ -1269,14 +1269,14 @@ static int mask_hide_view_clear_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Mask *mask = CTX_data_edit_mask(C);
 	MaskLayer *masklay;
-	int changed = FALSE;
+	bool changed = false;
 
 	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
 
 		if (masklay->restrictflag & OB_RESTRICT_VIEW) {
 			ED_mask_layer_select_set(masklay, TRUE);
 			masklay->restrictflag &= ~OB_RESTRICT_VIEW;
-			changed = 1;
+			changed = true;
 		}
 	}
 
@@ -1312,7 +1312,7 @@ static int mask_hide_view_set_exec(bContext *C, wmOperator *op)
 	Mask *mask = CTX_data_edit_mask(C);
 	MaskLayer *masklay;
 	const int unselected = RNA_boolean_get(op->ptr, "unselected");
-	int changed = FALSE;
+	bool changed = false;
 
 	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
 
@@ -1325,7 +1325,7 @@ static int mask_hide_view_set_exec(bContext *C, wmOperator *op)
 				ED_mask_layer_select_set(masklay, FALSE);
 
 				masklay->restrictflag |= OB_RESTRICT_VIEW;
-				changed = 1;
+				changed = true;
 				if (masklay == BKE_mask_layer_active(mask)) {
 					BKE_mask_layer_active_set(mask, NULL);
 				}
@@ -1334,7 +1334,7 @@ static int mask_hide_view_set_exec(bContext *C, wmOperator *op)
 		else {
 			if (!ED_mask_layer_select_check(masklay)) {
 				masklay->restrictflag |= OB_RESTRICT_VIEW;
-				changed = 1;
+				changed = true;
 				if (masklay == BKE_mask_layer_active(mask)) {
 					BKE_mask_layer_active_set(mask, NULL);
 				}
@@ -1376,7 +1376,7 @@ static int mask_feather_weight_clear_exec(bContext *C, wmOperator *UNUSED(op))
 	Scene *scene = CTX_data_scene(C);
 	Mask *mask = CTX_data_edit_mask(C);
 	MaskLayer *masklay;
-	int changed = FALSE;
+	bool changed = false;
 	int i;
 
 	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
@@ -1393,7 +1393,7 @@ static int mask_feather_weight_clear_exec(bContext *C, wmOperator *UNUSED(op))
 				if (MASKPOINT_ISSEL_ANY(point)) {
 					BezTriple *bezt = &point->bezt;
 					bezt->weight = 0.0f;
-					changed = TRUE;
+					changed = true;
 				}
 			}
 		}
diff --git a/source/blender/editors/mask/mask_select.c b/source/blender/editors/mask/mask_select.c
index 90796e9eb93..613168e43a6 100644
--- a/source/blender/editors/mask/mask_select.c
+++ b/source/blender/editors/mask/mask_select.c
@@ -412,7 +412,8 @@ static int border_select_exec(bContext *C, wmOperator *op)
 
 	rcti rect;
 	rctf rectf;
-	int change = FALSE, mode, extend;
+	int mode;
+	bool changed = false, extend;
 
 	/* get rectangle from operator */
 	WM_operator_properties_border_to_rcti(op, &rect);
@@ -450,12 +451,12 @@ static int border_select_exec(bContext *C, wmOperator *op)
 					BKE_mask_point_select_set_handle(point, FALSE);
 				}
 
-				change = TRUE;
+				changed = true;
 			}
 		}
 	}
 
-	if (change) {
+	if (changed) {
 		ED_mask_select_flush_all(mask);
 
 		WM_event_add_notifier(C, NC_MASK | ND_SELECT, mask);
@@ -486,7 +487,7 @@ void MASK_OT_select_border(wmOperatorType *ot)
 	WM_operator_properties_gesture_border(ot, TRUE);
 }
 
-static int do_lasso_select_mask(bContext *C, const int mcords[][2], short moves, short select)
+static bool do_lasso_select_mask(bContext *C, const int mcords[][2], short moves, short select)
 {
 	ScrArea *sa = CTX_wm_area(C);
 	ARegion *ar = CTX_wm_region(C);
@@ -496,7 +497,7 @@ static int do_lasso_select_mask(bContext *C, const int mcords[][2], short moves,
 	int i;
 
 	rcti rect;
-	int change = FALSE;
+	bool changed = false;
 
 	/* get rectangle from operator */
 	BLI_lasso_boundbox(&rect, mcords, moves);
@@ -533,18 +534,18 @@ static int do_lasso_select_mask(bContext *C, const int mcords[][2], short moves,
 					BKE_mask_point_select_set_handle(point, select);
 				}
 
-				change = TRUE;
+				changed = true;
 			}
 		}
 	}
 
-	if (change) {
+	if (changed) {
 		ED_mask_select_flush_all(mask);
 
 		WM_event_add_notifier(C, NC_MASK | ND_SELECT, mask);
 	}
 
-	return change;
+	return changed;
 }
 
 static int clip_lasso_select_exec(bContext *C, wmOperator *op)
@@ -610,8 +611,9 @@ static int circle_select_exec(bContext *C, wmOperator *op)
 	MaskLayer *masklay;
 	int i;
 
-	int x, y, radius, width, height, mode, change = FALSE;
 	float zoomx, zoomy, offset[2], ellipse[2];
+	int x, y, radius, width, height, mode;
+	bool changed = false;
 
 	/* get operator properties */
 	x = RNA_int_get(op->ptr, "x");
@@ -649,13 +651,13 @@ static int circle_select_exec(bContext *C, wmOperator *op)
 					BKE_mask_point_select_set(point, mode == GESTURE_MODAL_SELECT);
 					BKE_mask_point_select_set_handle(point, mode == GESTURE_MODAL_SELECT);
 
-					change = TRUE;
+					changed = true;
 				}
 			}
 		}
 	}
 
-	if (change) {
+	if (changed) {
 		ED_mask_select_flush_all(mask);
 
 		WM_event_add_notifier(C, NC_MASK | ND_SELECT, mask);
@@ -703,7 +705,7 @@ static int mask_select_linked_pick_invoke(bContext *C, wmOperator *op, const wmE
 
 	int is_handle = 0;
 	const float threshold = 19;
-	int change = FALSE;
+	bool changed = false;
 
 	ED_mask_mouse_pos(sa, ar, event->mval, co);
 
@@ -714,10 +716,10 @@ static int mask_select_linked_pick_invoke(bContext *C, wmOperator *op, const wmE
 		masklay->act_spline = spline;
 		masklay->act_point = point;
 
-		change = TRUE;
+		changed = true;
 	}
 
-	if (change) {
+	if (changed) {
 		ED_mask_select_flush_all(mask);
 
 		WM_event_add_notifier(C, NC_MASK | ND_SELECT, mask);
@@ -750,7 +752,7 @@ static int mask_select_linked_exec(bContext *C, wmOperator *UNUSED(op))
 	Mask *mask = CTX_data_edit_mask(C);
 	MaskLayer *masklay;
 
-	int change = FALSE;
+	bool changed = false;
 
 	/* do actual selection */
 	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
@@ -763,12 +765,12 @@ static int mask_select_linked_exec(bContext *C, wmOperator *UNUSED(op))
 		for (spline = masklay->splines.first; spline; spline = spline->next) {
 			if (ED_mask_spline_select_check(spline)) {
 				ED_mask_spline_select_set(spline, TRUE);
-				change = TRUE;
+				changed = true;
 			}
 		}
 	}
 
-	if (change) {
+	if (changed) {
 		ED_mask_select_flush_all(mask);
 
 		WM_event_add_notifier(C, NC_MASK | ND_SELECT, mask);
diff --git a/source/blender/editors/mask/mask_shapekey.c b/source/blender/editors/mask/mask_shapekey.c
index 78dba382520..cea350219c0 100644
--- a/source/blender/editors/mask/mask_shapekey.c
+++ b/source/blender/editors/mask/mask_shapekey.c
@@ -60,7 +60,7 @@ static int mask_shape_key_insert_exec(bContext *C, wmOperator *UNUSED(op))
 	const int frame = CFRA;
 	Mask *mask = CTX_data_edit_mask(C);
 	MaskLayer *masklay;
-	int change = FALSE;
+	bool changed = false;
 
 	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
 		MaskLayerShape *masklay_shape;
@@ -71,10 +71,10 @@ static int mask_shape_key_insert_exec(bContext *C, wmOperator *UNUSED(op))
 
 		masklay_shape = BKE_mask_layer_shape_verify_frame(masklay, frame);
 		BKE_mask_layer_shape_from_mask(masklay, masklay_shape);
-		change = TRUE;
+		changed = true;
 	}
 
-	if (change) {
+	if (changed) {
 		WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
 		DAG_id_tag_update(&mask->id, 0);
 
@@ -106,7 +106,7 @@ static int mask_shape_key_clear_exec(bContext *C, wmOperator *UNUSED(op))
 	const int frame = CFRA;
 	Mask *mask = CTX_data_edit_mask(C);
 	MaskLayer *masklay;
-	int change = FALSE;
+	bool changed = false;
 
 	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
 		MaskLayerShape *masklay_shape;
@@ -119,11 +119,11 @@ static int mask_shape_key_clear_exec(bContext *C, wmOperator *UNUSED(op))
 
 		if (masklay_shape) {
 			BKE_mask_layer_shape_unlink(masklay, masklay_shape);
-			change = TRUE;
+			changed = true;
 		}
 	}
 
-	if (change) {
+	if (changed) {
 		WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
 		DAG_id_tag_update(&mask->id, OB_RECALC_DATA);
 
@@ -155,7 +155,7 @@ static int mask_shape_key_feather_reset_exec(bContext *C, wmOperator *UNUSED(op)
 	const int frame = CFRA;
 	Mask *mask = CTX_data_edit_mask(C);
 	MaskLayer *masklay;
-	int change = FALSE;
+	bool changed = false;
 
 	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
 
@@ -208,14 +208,14 @@ static int mask_shape_key_feather_reset_exec(bContext *C, wmOperator *UNUSED(op)
 					// printf("%s: skipping\n", __func__);
 				}
 
-				change = TRUE;
+				changed = true;
 			}
 
 			BKE_mask_layer_shape_free(masklay_shape_reset);
 		}
 	}
 
-	if (change) {
+	if (changed) {
 		WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
 		DAG_id_tag_update(&mask->id, 0);
 
@@ -255,7 +255,7 @@ static int mask_shape_key_rekey_exec(bContext *C, wmOperator *op)
 	const int frame = CFRA;
 	Mask *mask = CTX_data_edit_mask(C);
 	MaskLayer *masklay;
-	int change = FALSE;
+	bool changed = false;
 
 	const short do_feather  = RNA_boolean_get(op->ptr, "feather");
 	const short do_location = RNA_boolean_get(op->ptr, "location");
@@ -371,7 +371,7 @@ static int mask_shape_key_rekey_exec(bContext *C, wmOperator *op)
 						BKE_mask_layer_shape_free(masklay_shape_tmp);
 					}
 
-					change = TRUE;
+					changed = true;
 				}
 			}
 
@@ -380,7 +380,7 @@ static int mask_shape_key_rekey_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	if (change) {
+	if (changed) {
 		WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
 		DAG_id_tag_update(&mask->id, 0);
 
@@ -421,23 +421,23 @@ void ED_mask_layer_shape_auto_key(MaskLayer *masklay, const int frame)
 	BKE_mask_layer_shape_from_mask(masklay, masklay_shape);
 }
 
-int ED_mask_layer_shape_auto_key_all(Mask *mask, const int frame)
+bool ED_mask_layer_shape_auto_key_all(Mask *mask, const int frame)
 {
 	MaskLayer *masklay;
-	int change = FALSE;
+	bool changed = false;
 
 	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
 		ED_mask_layer_shape_auto_key(masklay, frame);
-		change = TRUE;
+		changed = true;
 	}
 
-	return change;
+	return changed;
 }
 
-int ED_mask_layer_shape_auto_key_select(Mask *mask, const int frame)
+bool ED_mask_layer_shape_auto_key_select(Mask *mask, const int frame)
 {
 	MaskLayer *masklay;
-	int change = FALSE;
+	bool changed = false;
 
 	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
 
@@ -446,8 +446,8 @@ int ED_mask_layer_shape_auto_key_select(Mask *mask, const int frame)
 		}
 
 		ED_mask_layer_shape_auto_key(masklay, frame);
-		change = TRUE;
+		changed = true;
 	}
 
-	return change;
+	return changed;
 }