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.

5 files changed, 104 insertions, 104 deletions

diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 2e011493fce..465eb07f993 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -137,7 +137,7 @@ static int object_hide_view_clear_exec(bContext *C, wmOperator *UNUSED(op))
 	View3D *v3d = sa->spacedata.first;
 	Scene *scene = CTX_data_scene(C);
 	Base *base;
-	int changed = 0;
+	bool changed = false;
 	
 	/* XXX need a context loop to handle such cases */
 	for (base = FIRSTBASE; base; base = base->next) {
@@ -145,7 +145,7 @@ static int object_hide_view_clear_exec(bContext *C, wmOperator *UNUSED(op))
 			base->flag |= SELECT;
 			base->object->flag = base->flag;
 			base->object->restrictflag &= ~OB_RESTRICT_VIEW; 
-			changed = 1;
+			changed = true;
 		}
 	}
 	if (changed) {
@@ -177,7 +177,7 @@ static int object_hide_view_set_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
-	short changed = 0;
+	bool changed = false;
 	const int unselected = RNA_boolean_get(op->ptr, "unselected");
 	
 	CTX_DATA_BEGIN(C, Base *, base, visible_bases)
@@ -187,7 +187,7 @@ static int object_hide_view_set_exec(bContext *C, wmOperator *op)
 				base->flag &= ~SELECT;
 				base->object->flag = base->flag;
 				base->object->restrictflag |= OB_RESTRICT_VIEW;
-				changed = 1;
+				changed = true;
 				if (base == BASACT) {
 					ED_base_object_activate(C, NULL);
 				}
@@ -196,7 +196,7 @@ static int object_hide_view_set_exec(bContext *C, wmOperator *op)
 		else {
 			if (!(base->flag & SELECT)) {
 				base->object->restrictflag |= OB_RESTRICT_VIEW;
-				changed = 1;
+				changed = true;
 				if (base == BASACT) {
 					ED_base_object_activate(C, NULL);
 				}
@@ -237,14 +237,14 @@ void OBJECT_OT_hide_view_set(wmOperatorType *ot)
 /* 99% same as above except no need for scene refreshing (TODO, update render preview) */
 static int object_hide_render_clear_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	short changed = 0;
+	bool changed = false;
 
 	/* XXX need a context loop to handle such cases */
 	CTX_DATA_BEGIN(C, Object *, ob, selected_editable_objects)
 	{
 		if (ob->restrictflag & OB_RESTRICT_RENDER) {
 			ob->restrictflag &= ~OB_RESTRICT_RENDER;
-			changed = 1;
+			changed = true;
 		}
 	}
 	CTX_DATA_END;
diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c
index ffa9eed65b9..fc83919144f 100644
--- a/source/blender/editors/object/object_select.c
+++ b/source/blender/editors/object/object_select.c
@@ -216,7 +216,7 @@ static EnumPropertyItem prop_select_linked_types[] = {
 #if 0
 static int object_select_all_by_ipo(bContext *C, Ipo *ipo)
 {
-	int changed = FALSE;
+	bool changed = false;
 
 	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
@@ -224,7 +224,7 @@ static int object_select_all_by_ipo(bContext *C, Ipo *ipo)
 			base->flag |= SELECT;
 			base->object->flag = base->flag;
 
-			changed = TRUE;
+			changed = true;
 		}
 	}
 	CTX_DATA_END;
@@ -233,9 +233,9 @@ static int object_select_all_by_ipo(bContext *C, Ipo *ipo)
 }
 #endif
 
-static int object_select_all_by_obdata(bContext *C, void *obdata)
+static bool object_select_all_by_obdata(bContext *C, void *obdata)
 {
-	int changed = FALSE;
+	bool changed = false;
 
 	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
@@ -244,7 +244,7 @@ static int object_select_all_by_obdata(bContext *C, void *obdata)
 				base->flag |= SELECT;
 				base->object->flag = base->flag;
 
-				changed = TRUE;
+				changed = true;
 			}
 		}
 	}
@@ -253,9 +253,9 @@ static int object_select_all_by_obdata(bContext *C, void *obdata)
 	return changed;
 }
 
-static int object_select_all_by_material_texture(bContext *C, int use_texture, Material *mat, Tex *tex)
+static bool object_select_all_by_material_texture(bContext *C, int use_texture, Material *mat, Tex *tex)
 {
-	int changed = FALSE;
+	bool changed = false;
 
 	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
@@ -270,7 +270,7 @@ static int object_select_all_by_material_texture(bContext *C, int use_texture, M
 				if (!use_texture) {
 					if (mat1 == mat) {
 						base->flag |= SELECT;
-						changed = TRUE;
+						changed = true;
 					}
 				}
 				else if (mat1 && use_texture) {
@@ -278,7 +278,7 @@ static int object_select_all_by_material_texture(bContext *C, int use_texture, M
 						if (mat1->mtex[b]) {
 							if (tex == mat1->mtex[b]->tex) {
 								base->flag |= SELECT;
-								changed = TRUE;
+								changed = true;
 								break;
 							}
 						}
@@ -294,9 +294,9 @@ static int object_select_all_by_material_texture(bContext *C, int use_texture, M
 	return changed;
 }
 
-static int object_select_all_by_dup_group(bContext *C, Object *ob)
+static bool object_select_all_by_dup_group(bContext *C, Object *ob)
 {
-	int changed = FALSE;
+	bool changed = false;
 	Group *dup_group = (ob->transflag & OB_DUPLIGROUP) ? ob->dup_group : NULL;
 
 	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
@@ -307,7 +307,7 @@ static int object_select_all_by_dup_group(bContext *C, Object *ob)
 				base->flag |= SELECT;
 				base->object->flag = base->flag;
 
-				changed = TRUE;
+				changed = true;
 			}
 		}
 	}
@@ -316,9 +316,9 @@ static int object_select_all_by_dup_group(bContext *C, Object *ob)
 	return changed;
 }
 
-static int object_select_all_by_particle(bContext *C, Object *ob)
+static bool object_select_all_by_particle(bContext *C, Object *ob)
 {
-	int changed = FALSE;
+	bool changed = false;
 
 	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
@@ -331,7 +331,7 @@ static int object_select_all_by_particle(bContext *C, Object *ob)
 				for (psys_act = ob->particlesystem.first; psys_act; psys_act = psys_act->next) {
 					if (psys->part == psys_act->part) {
 						base->flag |= SELECT;
-						changed = TRUE;
+						changed = true;
 						break;
 					}
 				}
@@ -349,9 +349,9 @@ static int object_select_all_by_particle(bContext *C, Object *ob)
 	return changed;
 }
 
-static int object_select_all_by_library(bContext *C, Library *lib)
+static bool object_select_all_by_library(bContext *C, Library *lib)
 {
-	int changed = FALSE;
+	bool changed = false;
 
 	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
@@ -360,7 +360,7 @@ static int object_select_all_by_library(bContext *C, Library *lib)
 				base->flag |= SELECT;
 				base->object->flag = base->flag;
 
-				changed = TRUE;
+				changed = true;
 			}
 		}
 	}
@@ -369,9 +369,9 @@ static int object_select_all_by_library(bContext *C, Library *lib)
 	return changed;
 }
 
-static int object_select_all_by_library_obdata(bContext *C, Library *lib)
+static bool object_select_all_by_library_obdata(bContext *C, Library *lib)
 {
-	int changed = FALSE;
+	bool changed = false;
 
 	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
@@ -380,7 +380,7 @@ static int object_select_all_by_library_obdata(bContext *C, Library *lib)
 				base->flag |= SELECT;
 				base->object->flag = base->flag;
 
-				changed = TRUE;
+				changed = true;
 			}
 		}
 	}
@@ -392,7 +392,7 @@ static int object_select_all_by_library_obdata(bContext *C, Library *lib)
 void ED_object_select_linked_by_id(bContext *C, ID *id)
 {
 	int idtype = GS(id->name);
-	int changed = FALSE;
+	bool changed = false;
 
 	if (OB_DATA_SUPPORT_ID(idtype)) {
 		changed = object_select_all_by_obdata(C, id);
@@ -414,7 +414,7 @@ static int object_select_linked_exec(bContext *C, wmOperator *op)
 	Scene *scene = CTX_data_scene(C);
 	Object *ob;
 	int nr = RNA_enum_get(op->ptr, "type");
-	short changed = FALSE, extend;
+	bool changed = false, extend;
 
 	extend = RNA_boolean_get(op->ptr, "extend");
 	
@@ -533,16 +533,16 @@ static EnumPropertyItem prop_select_grouped_types[] = {
 	{0, NULL, 0, NULL, NULL}
 };
 
-static short select_grouped_children(bContext *C, Object *ob, int recursive)
+static bool select_grouped_children(bContext *C, Object *ob, const bool recursive)
 {
-	short changed = 0;
+	bool changed = false;
 
 	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
 		if (ob == base->object->parent) {
 			if (!(base->flag & SELECT)) {
 				ED_base_object_select(base, BA_SELECT);
-				changed = 1;
+				changed = true;
 			}
 
 			if (recursive)
@@ -553,12 +553,12 @@ static short select_grouped_children(bContext *C, Object *ob, int recursive)
 	return changed;
 }
 
-static short select_grouped_parent(bContext *C) /* Makes parent active and de-selected OBACT */
+static bool select_grouped_parent(bContext *C) /* Makes parent active and de-selected OBACT */
 {
 	Scene *scene = CTX_data_scene(C);
 	View3D *v3d = CTX_wm_view3d(C);
 
-	short changed = 0;
+	bool changed = false;
 	Base *baspar, *basact = CTX_data_active_base(C);
 
 	if (!basact || !(basact->object->parent)) return 0;  /* we know OBACT is valid */
@@ -570,16 +570,16 @@ static short select_grouped_parent(bContext *C) /* Makes parent active and de-se
 		ED_base_object_select(basact, BA_DESELECT);
 		ED_base_object_select(baspar, BA_SELECT);
 		ED_base_object_activate(C, baspar);
-		changed = 1;
+		changed = true;
 	}
 	return changed;
 }
 
 
 #define GROUP_MENU_MAX  24
-static short select_grouped_group(bContext *C, Object *ob)  /* Select objects in the same group as the active */
+static bool select_grouped_group(bContext *C, Object *ob)  /* Select objects in the same group as the active */
 {
-	short changed = 0;
+	bool changed = false;
 	Group *group, *ob_groups[GROUP_MENU_MAX];
 	int group_count = 0, i;
 	uiPopupMenu *pup;
@@ -600,7 +600,7 @@ static short select_grouped_group(bContext *C, Object *ob)  /* Select objects in
 		{
 			if (!(base->flag & SELECT) && BKE_group_object_exists(group, base->object)) {
 				ED_base_object_select(base, BA_SELECT);
-				changed = 1;
+				changed = true;
 			}
 		}
 		CTX_DATA_END;
@@ -620,12 +620,12 @@ static short select_grouped_group(bContext *C, Object *ob)  /* Select objects in
 	return changed;  /* The operator already handle this! */
 }
 
-static short select_grouped_object_hooks(bContext *C, Object *ob)
+static bool select_grouped_object_hooks(bContext *C, Object *ob)
 {
 	Scene *scene = CTX_data_scene(C);
 	View3D *v3d = CTX_wm_view3d(C);
 
-	short changed = 0;
+	bool changed = false;
 	Base *base;
 	ModifierData *md;
 	HookModifierData *hmd;
@@ -637,7 +637,7 @@ static short select_grouped_object_hooks(bContext *C, Object *ob)
 				base = BKE_scene_base_find(scene, hmd->object);
 				if (base && (BASE_SELECTABLE(v3d, base))) {
 					ED_base_object_select(base, BA_SELECT);
-					changed = 1;
+					changed = true;
 				}
 			}
 		}
@@ -647,25 +647,25 @@ static short select_grouped_object_hooks(bContext *C, Object *ob)
 
 /* Select objects with the same parent as the active (siblings),
  * parent can be NULL also */
-static short select_grouped_siblings(bContext *C, Object *ob)
+static bool select_grouped_siblings(bContext *C, Object *ob)
 {
-	short changed = 0;
+	bool changed = false;
 
 	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
 		if ((base->object->parent == ob->parent) && !(base->flag & SELECT)) {
 			ED_base_object_select(base, BA_SELECT);
-			changed = 1;
+			changed = true;
 		}
 	}
 	CTX_DATA_END;
 	return changed;
 }
-static short select_similar_lamps(bContext *C, Object *ob)
+static bool select_similar_lamps(bContext *C, Object *ob)
 {
 	Lamp *la = ob->data;
 
-	short changed = 0;
+	bool changed = false;
 
 	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
@@ -673,88 +673,88 @@ static short select_similar_lamps(bContext *C, Object *ob)
 			Lamp *la_test = base->object->data;
 			if ((la->type == la_test->type) && !(base->flag & SELECT)) {
 				ED_base_object_select(base, BA_SELECT);
-				changed = 1;
+				changed = true;
 			}
 		}
 	}
 	CTX_DATA_END;
 	return changed;
 }
-static short select_similar_pass_index(bContext *C, Object *ob)
+static bool select_similar_pass_index(bContext *C, Object *ob)
 {
-	char changed = 0;
+	bool changed = false;
 
 	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
 		if ((base->object->index == ob->index) && !(base->flag & SELECT)) {
 			ED_base_object_select(base, BA_SELECT);
-			changed = 1;
+			changed = true;
 		}
 	}
 	CTX_DATA_END;
 	return changed;
 }
-static short select_grouped_type(bContext *C, Object *ob)
+static bool select_grouped_type(bContext *C, Object *ob)
 {
-	short changed = 0;
+	bool changed = false;
 
 	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
 		if ((base->object->type == ob->type) && !(base->flag & SELECT)) {
 			ED_base_object_select(base, BA_SELECT);
-			changed = 1;
+			changed = true;
 		}
 	}
 	CTX_DATA_END;
 	return changed;
 }
 
-static short select_grouped_layer(bContext *C, Object *ob)
+static bool select_grouped_layer(bContext *C, Object *ob)
 {
-	char changed = 0;
+	bool changed = false;
 
 	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
 		if ((base->lay & ob->lay) && !(base->flag & SELECT)) {
 			ED_base_object_select(base, BA_SELECT);
-			changed = 1;
+			changed = true;
 		}
 	}
 	CTX_DATA_END;
 	return changed;
 }
 
-static short select_grouped_index_object(bContext *C, Object *ob)
+static bool select_grouped_index_object(bContext *C, Object *ob)
 {
-	char changed = 0;
+	bool changed = false;
 
 	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
 		if ((base->object->index == ob->index) && !(base->flag & SELECT)) {
 			ED_base_object_select(base, BA_SELECT);
-			changed = 1;
+			changed = true;
 		}
 	}
 	CTX_DATA_END;
 	return changed;
 }
 
-static short select_grouped_color(bContext *C, Object *ob)
+static bool select_grouped_color(bContext *C, Object *ob)
 {
-	char changed = 0;
+	bool changed = false;
 
 	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
 		if (!(base->flag & SELECT) && (compare_v3v3(base->object->col, ob->col, 0.005f))) {
 			ED_base_object_select(base, BA_SELECT);
-			changed = 1;
+			changed = true;
 		}
 	}
 	CTX_DATA_END;
 	return changed;
 }
 
-static short objects_share_gameprop(Object *a, Object *b)
+static bool objects_share_gameprop(Object *a, Object *b)
 {
 	bProperty *prop;
 	/*make a copy of all its properties*/
@@ -766,25 +766,25 @@ static short objects_share_gameprop(Object *a, Object *b)
 	return 0;
 }
 
-static short select_grouped_gameprops(bContext *C, Object *ob)
+static bool select_grouped_gameprops(bContext *C, Object *ob)
 {
-	char changed = 0;
+	bool changed = false;
 
 	CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
 	{
 		if (!(base->flag & SELECT) && (objects_share_gameprop(base->object, ob))) {
 			ED_base_object_select(base, BA_SELECT);
-			changed = 1;
+			changed = true;
 		}
 	}
 	CTX_DATA_END;
 	return changed;
 }
 
-static short select_grouped_keyingset(bContext *C, Object *UNUSED(ob))
+static bool select_grouped_keyingset(bContext *C, Object *UNUSED(ob))
 {
 	KeyingSet *ks = ANIM_scene_get_active_keyingset(CTX_data_scene(C));
-	short changed = 0;
+	bool changed = false;
 	
 	/* firstly, validate KeyingSet */
 	if ((ks == NULL) || (ANIM_validate_keyingset(C, NULL, ks) != 0))
@@ -806,7 +806,7 @@ static short select_grouped_keyingset(bContext *C, Object *UNUSED(ob))
 				/* if id matches, select then stop looping (match found) */
 				if (ksp->id == (ID *)base->object) {
 					ED_base_object_select(base, BA_SELECT);
-					changed = 1;
+					changed = true;
 					break;
 				}
 			}
@@ -822,7 +822,7 @@ static int object_select_grouped_exec(bContext *C, wmOperator *op)
 	Scene *scene = CTX_data_scene(C);
 	Object *ob;
 	int nr = RNA_enum_get(op->ptr, "type");
-	short changed = 0, extend;
+	bool changed = false, extend;
 
 	extend = RNA_boolean_get(op->ptr, "extend");
 	
@@ -830,7 +830,7 @@ static int object_select_grouped_exec(bContext *C, wmOperator *op)
 		CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 		{
 			ED_base_object_select(base, BA_DESELECT);
-			changed = 1;
+			changed = true;
 		}
 		CTX_DATA_END;
 	}
diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c
index 6be4a2fed2c..5d10d67f0c9 100644
--- a/source/blender/editors/object/object_shapekey.c
+++ b/source/blender/editors/object/object_shapekey.c
@@ -341,16 +341,16 @@ static int shape_key_remove_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Object *ob = ED_object_context(C);
-	bool change = false;
+	bool changed = false;
 
 	if (RNA_boolean_get(op->ptr, "all")) {
-		change = ED_object_shape_key_remove_all(bmain, ob);
+		changed = ED_object_shape_key_remove_all(bmain, ob);
 	}
 	else {
-		change = ED_object_shape_key_remove(bmain, ob);
+		changed = ED_object_shape_key_remove(bmain, ob);
 	}
 
-	if (change) {
+	if (changed) {
 		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c
index fef5ae392ea..63388600398 100644
--- a/source/blender/editors/object/object_transform.c
+++ b/source/blender/editors/object/object_transform.c
@@ -380,7 +380,7 @@ static int apply_objects_internal(bContext *C, ReportList *reports, int apply_lo
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
 	float rsmat[3][3], obmat[3][3], iobmat[3][3], mat[4][4], scale;
-	bool change = true;
+	bool changed = true;
 	
 	/* first check if we can execute */
 	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
@@ -391,14 +391,14 @@ static int apply_objects_internal(bContext *C, ReportList *reports, int apply_lo
 				BKE_reportf(reports, RPT_ERROR,
 				            "Cannot apply to a multi user: Object \"%s\", %s \"%s\", aborting",
 				            ob->id.name + 2, BKE_idcode_to_name(GS(obdata->name)), obdata->name + 2);
-				change = false;
+				changed = false;
 			}
 
 			if (obdata->lib) {
 				BKE_reportf(reports, RPT_ERROR,
 				            "Cannot apply to library data: Object \"%s\", %s \"%s\", aborting",
 				            ob->id.name + 2, BKE_idcode_to_name(GS(obdata->name)), obdata->name + 2);
-				change = false;
+				changed = false;
 			}
 		}
 
@@ -412,22 +412,22 @@ static int apply_objects_internal(bContext *C, ReportList *reports, int apply_lo
 				BKE_reportf(reports, RPT_ERROR,
 				            "Rotation/Location can't apply to a 2D curve: Object \"%s\", %s \"%s\", aborting",
 				            ob->id.name + 2, BKE_idcode_to_name(GS(obdata->name)), obdata->name + 2);
-				change = false;
+				changed = false;
 			}
 			if (cu->key) {
 				BKE_reportf(reports, RPT_ERROR,
 				            "Can't apply to a curve with shape-keys: Object \"%s\", %s \"%s\", aborting",
 				            ob->id.name + 2, BKE_idcode_to_name(GS(obdata->name)), obdata->name + 2);
-				change = false;
+				changed = false;
 			}
 		}
 	}
 	CTX_DATA_END;
 	
-	if (!change)
+	if (!changed)
 		return OPERATOR_CANCELLED;
 
-	change = false;
+	changed = false;
 
 	/* now execute */
 	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
@@ -592,11 +592,11 @@ static int apply_objects_internal(bContext *C, ReportList *reports, int apply_lo
 
 		DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
 
-		change = true;
+		changed = true;
 	}
 	CTX_DATA_END;
 
-	if (!change) {
+	if (!changed) {
 		BKE_report(reports, RPT_WARNING, "Objects have no data to transform");
 		return OPERATOR_CANCELLED;
 	}
@@ -608,7 +608,7 @@ static int apply_objects_internal(bContext *C, ReportList *reports, int apply_lo
 static int visual_transform_apply_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Scene *scene = CTX_data_scene(C);
-	int change = 0;
+	bool changed = false;
 	
 	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
 	{
@@ -619,11 +619,11 @@ static int visual_transform_apply_exec(bContext *C, wmOperator *UNUSED(op))
 		/* update for any children that may get moved */
 		DAG_id_tag_update(&ob->id, OB_RECALC_OB);
 	
-		change = 1;
+		changed = true;
 	}
 	CTX_DATA_END;
 
-	if (!change)
+	if (!changed)
 		return OPERATOR_CANCELLED;
 
 	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index 16ee400fa67..f6761aab42c 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -2811,7 +2811,7 @@ static bool vgroup_active_remove_verts(Object *ob, const bool allverts, bDeformG
 {
 	MDeformVert *dv;
 	const int def_nr = BLI_findindex(&ob->defbase, dg);
-	bool change = false;
+	bool changed = false;
 
 	if (ob->type == OB_MESH) {
 		Mesh *me = ob->data;
@@ -2830,7 +2830,7 @@ static bool vgroup_active_remove_verts(Object *ob, const bool allverts, bDeformG
 					if (dv && dv->dw && (allverts || BM_elem_flag_test(eve, BM_ELEM_SELECT))) {
 						MDeformWeight *dw = defvert_find_index(dv, def_nr);
 						defvert_remove_group(dv, dw); /* dw can be NULL */
-						change = true;
+						changed = true;
 					}
 				}
 			}
@@ -2848,7 +2848,7 @@ static bool vgroup_active_remove_verts(Object *ob, const bool allverts, bDeformG
 						if (dv->dw && (allverts || (mv->flag & SELECT))) {
 							MDeformWeight *dw = defvert_find_index(dv, def_nr);
 							defvert_remove_group(dv, dw); /* dw can be NULL */
-							change = true;
+							changed = true;
 						}
 					}
 				}
@@ -2870,13 +2870,13 @@ static bool vgroup_active_remove_verts(Object *ob, const bool allverts, bDeformG
 
 					dw = defvert_find_index(dv, def_nr);
 					defvert_remove_group(dv, dw); /* dw can be NULL */
-					change = true;
+					changed = true;
 				}
 			}
 		}
 	}
 
-	return change;
+	return changed;
 }
 
 static void vgroup_delete_edit_mode(Object *ob, bDeformGroup *dg)
@@ -3077,16 +3077,16 @@ static void vgroup_assign_verts(Object *ob, const float weight)
 /* removes from all defgroup, if allverts==0 only selected vertices */
 static bool vgroup_remove_verts(Object *ob, int allverts)
 {
-	bool change = false;
+	bool changed = false;
 	/* To prevent code redundancy, we just use vgroup_active_remove_verts, but that
 	 * only operates on the active vgroup. So we iterate through all groups, by changing
 	 * active group index
 	 */
 	bDeformGroup *dg;
 	for (dg = ob->defbase.first; dg; dg = dg->next) {
-		change |= vgroup_active_remove_verts(ob, allverts, dg);
+		changed |= vgroup_active_remove_verts(ob, allverts, dg);
 	}
-	return change;
+	return changed;
 }
 
 /********************** vertex group operators *********************/
@@ -3965,22 +3965,22 @@ void OBJECT_OT_vertex_group_copy_to_linked(wmOperatorType *ot)
 static int vertex_group_copy_to_selected_exec(bContext *C, wmOperator *op)
 {
 	Object *obact = ED_object_context(C);
-	int change = 0;
+	int changed_tot = 0;
 	int fail = 0;
 
 	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
 	{
 		if (obact != ob) {
-			if (ED_vgroup_array_copy(ob, obact)) change++;
+			if (ED_vgroup_array_copy(ob, obact)) changed_tot++;
 			else fail++;
 		}
 	}
 	CTX_DATA_END;
 
-	if ((change == 0 && fail == 0) || fail) {
+	if ((changed_tot == 0 && fail == 0) || fail) {
 		BKE_reportf(op->reports, RPT_ERROR,
 		            "Copy vertex groups to selected: %d done, %d failed (object data must have matching indices)",
-		            change, fail);
+		            changed_tot, fail);
 	}
 
 	return OPERATOR_FINISHED;
@@ -4010,7 +4010,7 @@ static int vertex_group_transfer_weight_exec(bContext *C, wmOperator *op)
 	char dg_act_name[MAX_VGROUP_NAME];  /* may be freed so copy */
 
 	int fail = 0;
-	bool change = false;
+	bool changed = false;
 
 	WT_VertexGroupMode vertex_group_mode = RNA_enum_get(op->ptr, "group_select_mode");
 	WT_Method method = RNA_enum_get(op->ptr, "method");
@@ -4060,7 +4060,7 @@ static int vertex_group_transfer_weight_exec(bContext *C, wmOperator *op)
 					}
 
 					if (ed_vgroup_transfer_weight(ob_act, ob_src, dg_src, scene, method, replace_mode, op)) {
-						change = true;
+						changed = true;
 					}
 					else {
 						fail++;
@@ -4072,7 +4072,7 @@ static int vertex_group_transfer_weight_exec(bContext *C, wmOperator *op)
 					bDeformGroup *dg_src;
 					for (dg_src = ob_src->defbase.first; dg_src; dg_src = dg_src->next) {
 						if (ed_vgroup_transfer_weight(ob_act, ob_src, dg_src, scene, method, replace_mode, op)) {
-							change = true;
+							changed = true;
 						}
 						else {
 							fail++;
@@ -4088,7 +4088,7 @@ static int vertex_group_transfer_weight_exec(bContext *C, wmOperator *op)
 	}
 	CTX_DATA_END;
 
-	if (change) {
+	if (changed) {
 
 		/* possible the active vertex group changed because of adding/removing */
 		/* note!, dg_act may be realloc'd, only check its not NULL */