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.

12 files changed, 60 insertions, 59 deletions

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 731196c2480..5c98fe48ea6 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -3315,7 +3315,7 @@ bool DM_is_valid(DerivedMesh *dm)
 	const bool do_fixes = false;
 
 	bool is_valid = true;
-	bool is_change = true;
+	bool changed = true;
 
 	is_valid &= BKE_mesh_validate_all_customdata(
 	        dm->getVertDataLayout(dm),
@@ -3323,7 +3323,7 @@ bool DM_is_valid(DerivedMesh *dm)
 	        dm->getLoopDataLayout(dm),
 	        dm->getPolyDataLayout(dm),
 	        0,  /* setting mask here isn't useful, gives false positives */
-	        do_verbose, do_fixes, &is_change);
+	        do_verbose, do_fixes, &changed);
 
 	is_valid &= BKE_mesh_validate_arrays(
 	        NULL,
@@ -3333,9 +3333,9 @@ bool DM_is_valid(DerivedMesh *dm)
 	        dm->getLoopArray(dm), dm->getNumLoops(dm),
 	        dm->getPolyArray(dm), dm->getNumPolys(dm),
 	        dm->getVertDataArray(dm, CD_MDEFORMVERT),
-	        do_verbose, do_fixes, &is_change);
+	        do_verbose, do_fixes, &changed);
 
-	BLI_assert(is_change == false);
+	BLI_assert(changed == false);
 
 	return is_valid;
 }
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 3be80a7e30d..0267c9a6122 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -335,15 +335,15 @@ int bone_autoside_name(char name[MAXBONENAME], int UNUSED(strip_number), short a
 	 *	- otherwise, just append to end
 	 */
 	if (extension[0]) {
-		int change = 1;
+		bool changed = true;
 
-		while (change) { /* remove extensions */
-			change = 0;
+		while (changed) { /* remove extensions */
+			changed = false;
 			if (len > 2 && basename[len - 2] == '.') {
 				if (basename[len - 1] == 'L' || basename[len - 1] == 'R') { /* L R */
 					basename[len - 2] = '\0';
 					len -= 2;
-					change = 1;
+					changed = true;
 				}
 			}
 			else if (len > 3 && basename[len - 3] == '.') {
@@ -352,7 +352,7 @@ int bone_autoside_name(char name[MAXBONENAME], int UNUSED(strip_number), short a
 				{
 					basename[len - 3] = '\0';
 					len -= 3;
-					change = 1;
+					changed = true;
 				}
 			}
 			else if (len > 4 && basename[len - 4] == '.') {
@@ -361,7 +361,7 @@ int bone_autoside_name(char name[MAXBONENAME], int UNUSED(strip_number), short a
 				{
 					basename[len - 4] = '\0';
 					len -= 4;
-					change = 1;
+					changed = true;
 				}
 			}
 		}
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index bcf0eafaa65..bdc70ed2afe 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -3658,30 +3658,30 @@ bool BKE_nurb_check_valid_v(struct Nurb *nu)
 
 bool BKE_nurb_order_clamp_u(struct Nurb *nu)
 {
-	bool change = false;
+	bool changed = false;
 	if (nu->pntsu < nu->orderu) {
 		nu->orderu = nu->pntsu;
-		change = true;
+		changed = true;
 	}
 	if (((nu->flagu & CU_NURB_CYCLIC) == 0) && (nu->flagu & CU_NURB_BEZIER)) {
 		CLAMP(nu->orderu, 3, 4);
-		change = true;
+		changed = true;
 	}
-	return change;
+	return changed;
 }
 
 bool BKE_nurb_order_clamp_v(struct Nurb *nu)
 {
-	bool change = false;
+	bool changed = false;
 	if (nu->pntsv < nu->orderv) {
 		nu->orderv = nu->pntsv;
-		change = true;
+		changed = true;
 	}
 	if (((nu->flagv & CU_NURB_CYCLIC) == 0) && (nu->flagv & CU_NURB_BEZIER)) {
 		CLAMP(nu->orderv, 3, 4);
-		change = true;
+		changed = true;
 	}
-	return change;
+	return changed;
 }
 
 bool BKE_nurb_type_convert(Nurb *nu, const short type, const bool use_handles)
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 8a74f4719d5..a7d87fad38e 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1296,7 +1296,7 @@ bool CustomData_merge(const struct CustomData *source, struct CustomData *dest,
 	CustomDataLayer *layer, *newlayer;
 	void *data;
 	int i, type, number = 0, lasttype = -1, lastactive = 0, lastrender = 0, lastclone = 0, lastmask = 0, lastflag = 0;
-	bool change = false;
+	bool changed = false;
 
 	for (i = 0; i < source->totlayer; ++i) {
 		layer = &source->layers[i];
@@ -1346,12 +1346,12 @@ bool CustomData_merge(const struct CustomData *source, struct CustomData *dest,
 			newlayer->active_clone = lastclone;
 			newlayer->active_mask = lastmask;
 			newlayer->flag |= lastflag & (CD_FLAG_EXTERNAL | CD_FLAG_IN_MEMORY);
-			change = true;
+			changed = true;
 		}
 	}
 
 	CustomData_update_typemap(dest);
-	return change;
+	return changed;
 }
 
 void CustomData_copy(const struct CustomData *source, struct CustomData *dest,
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index cb7b4a32feb..6ef20ecc047 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -1466,7 +1466,8 @@ static void flush_update_node(Main *bmain, DagNode *node, unsigned int layer, in
 {
 	DagAdjList *itA;
 	Object *ob, *obc;
-	int oldflag, changed = 0;
+	int oldflag;
+	bool changed = false;
 	unsigned int all_layer;
 	
 	node->lasttime = curtime;
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 689d0a2cd47..3ce44dcb1f1 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -61,7 +61,7 @@
 bool free_gpencil_strokes(bGPDframe *gpf)
 {
 	bGPDstroke *gps, *gpsn;
-	bool modified = gpf->strokes.first != NULL;
+	bool changed = (gpf->strokes.first != NULL);
 	
 	/* error checking */
 	if (gpf == NULL)
@@ -76,7 +76,7 @@ bool free_gpencil_strokes(bGPDframe *gpf)
 		BLI_freelinkN(&gpf->strokes, gps);
 	}
 
-	return modified;
+	return changed;
 }
 
 /* Free all of a gp-layer's frames */
@@ -473,18 +473,18 @@ bGPDframe *gpencil_layer_getframe(bGPDlayer *gpl, int cframe, short addnew)
 /* delete the given frame from a layer */
 bool gpencil_layer_delframe(bGPDlayer *gpl, bGPDframe *gpf)
 {
-	bool modified = false;
+	bool changed = false;
 
 	/* error checking */
 	if (ELEM(NULL, gpl, gpf))
 		return false;
 		
 	/* free the frame and its data */
-	modified = free_gpencil_strokes(gpf);
+	changed = free_gpencil_strokes(gpf);
 	BLI_freelinkN(&gpl->frames, gpf);
 	gpl->actframe = NULL;
 
-	return modified;
+	return changed;
 }
 
 /* get the active gp-layer for editing */
diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c
index 214c49bcc83..6097e05d91d 100644
--- a/source/blender/blenkernel/intern/mask.c
+++ b/source/blender/blenkernel/intern/mask.c
@@ -1815,13 +1815,13 @@ MaskLayerShape *BKE_mask_layer_shape_duplicate(MaskLayerShape *masklay_shape)
 
 bool BKE_mask_layer_shape_unlink(MaskLayer *masklay, MaskLayerShape *masklay_shape)
 {
-	bool modified = masklay_shape != NULL;
+	bool changed = (masklay_shape != NULL);
 
 	BLI_remlink(&masklay->splines_shapes, masklay_shape);
 
 	BKE_mask_layer_shape_free(masklay_shape);
 
-	return modified;
+	return changed;
 }
 
 static int mask_layer_shape_sort_cb(void *masklay_shape_a_ptr, void *masklay_shape_b_ptr)
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index 83c257dbd56..1128c3e55c7 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -2375,7 +2375,7 @@ bool BKE_mball_minmax_ex(MetaBall *mb, float min[3], float max[3],
 {
 	const float scale = obmat ? mat4_to_scale(obmat) : 1.0f;
 	MetaElem *ml;
-	bool change = false;
+	bool changed = false;
 	float centroid[3], vec[3];
 
 	INIT_MINMAX(min, max);
@@ -2398,11 +2398,11 @@ bool BKE_mball_minmax_ex(MetaBall *mb, float min[3], float max[3],
 				add_v3_fl(vec, scale_mb * i);
 				minmax_v3v3_v3(min, max, vec);
 			}
-			change = true;
+			changed = true;
 		}
 	}
 
-	return change;
+	return changed;
 }
 
 
diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c
index a4f5529ee43..ad6a2de31cd 100644
--- a/source/blender/blenkernel/intern/mesh_validate.c
+++ b/source/blender/blenkernel/intern/mesh_validate.c
@@ -216,7 +216,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
                               MPoly *mpolys, unsigned int totpoly,
                               MDeformVert *dverts, /* assume totvert length */
                               const bool do_verbose, const bool do_fixes,
-                              bool *r_change)
+                              bool *r_changed)
 {
 #   define REMOVE_EDGE_TAG(_me) { _me->v2 = _me->v1; do_edge_free = true; } (void)0
 #   define IS_REMOVED_EDGE(_me) (_me->v2 == _me->v1)
@@ -854,7 +854,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
 
 	PRINT_MSG("%s: finished\n\n", __func__);
 
-	*r_change = (verts_fixed || vert_weights_fixed || do_polyloop_free || do_edge_free || do_edge_recalc || msel_fixed);
+	*r_changed = (verts_fixed || vert_weights_fixed || do_polyloop_free || do_edge_free || do_edge_recalc || msel_fixed);
 
 	return is_valid;
 }
@@ -963,7 +963,7 @@ bool BKE_mesh_validate_all_customdata(CustomData *vdata, CustomData *edata,
 int BKE_mesh_validate(Mesh *me, const int do_verbose)
 {
 	bool is_valid = true;
-	bool is_change;
+	bool changed;
 
 	if (do_verbose) {
 		printf("MESH: %s\n", me->id.name + 2);
@@ -973,7 +973,7 @@ int BKE_mesh_validate(Mesh *me, const int do_verbose)
 	        &me->vdata, &me->edata, &me->ldata, &me->pdata,
 	        true,
 	        do_verbose, true,
-	        &is_change);
+	        &changed);
 
 	is_valid &= BKE_mesh_validate_arrays(
 	        me,
@@ -984,9 +984,9 @@ int BKE_mesh_validate(Mesh *me, const int do_verbose)
 	        me->mpoly, me->totpoly,
 	        me->dvert,
 	        do_verbose, true,
-	        &is_change);
+	        &changed);
 
-	if (is_change) {
+	if (changed) {
 		DAG_id_tag_update(&me->id, OB_RECALC_DATA);
 		return true;
 	}
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 698f2a4ef2d..c3d08b65b57 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -2979,22 +2979,22 @@ void nodeUpdate(bNodeTree *ntree, bNode *node)
 	ntree->is_updating = FALSE;
 }
 
-int nodeUpdateID(bNodeTree *ntree, ID *id)
+bool nodeUpdateID(bNodeTree *ntree, ID *id)
 {
 	bNode *node;
-	int change = FALSE;
+	bool changed = false;
 	
 	if (ELEM(NULL, id, ntree))
-		return change;
+		return changed;
 	
 	/* avoid reentrant updates, can be caused by RNA update callbacks */
 	if (ntree->is_updating)
-		return change;
-	ntree->is_updating = TRUE;
+		return changed;
+	ntree->is_updating = true;
 	
 	for (node = ntree->nodes.first; node; node = node->next) {
 		if (node->id == id) {
-			change = TRUE;
+			changed = true;
 			node->update |= NODE_UPDATE_ID;
 			if (node->typeinfo->updatefunc)
 				node->typeinfo->updatefunc(ntree, node);
@@ -3008,7 +3008,7 @@ int nodeUpdateID(bNodeTree *ntree, ID *id)
 	}
 	
 	ntree->is_updating = FALSE;
-	return change;
+	return changed;
 }
 
 void nodeUpdateInternalLinks(bNodeTree *ntree, bNode *node)
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 45d9d144f55..24e4b177c4f 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2411,7 +2411,7 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us
 	BoundBox bb;
 	float vec[3];
 	int a;
-	bool change = false;
+	bool changed = false;
 	
 	switch (ob->type) {
 		case OB_CURVE:
@@ -2424,7 +2424,7 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us
 				mul_m4_v3(ob->obmat, bb.vec[a]);
 				minmax_v3v3_v3(min_r, max_r, bb.vec[a]);
 			}
-			change = TRUE;
+			changed = true;
 			break;
 		}
 		case OB_LATTICE:
@@ -2441,7 +2441,7 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us
 					}
 				}
 			}
-			change = TRUE;
+			changed = true;
 			break;
 		}
 		case OB_ARMATURE:
@@ -2459,7 +2459,7 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us
 						mul_v3_m4v3(vec, ob->obmat, pchan->pose_tail);
 						minmax_v3v3_v3(min_r, max_r, vec);
 
-						change = TRUE;
+						changed = true;
 					}
 				}
 			}
@@ -2476,7 +2476,7 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us
 					mul_m4_v3(ob->obmat, bb.vec[a]);
 					minmax_v3v3_v3(min_r, max_r, bb.vec[a]);
 				}
-				change = TRUE;
+				changed = true;
 			}
 			break;
 		}
@@ -2484,8 +2484,8 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us
 		{
 			float ob_min[3], ob_max[3];
 
-			change = BKE_mball_minmax_ex(ob->data, ob_min, ob_max, ob->obmat, 0);
-			if (change) {
+			changed = BKE_mball_minmax_ex(ob->data, ob_min, ob_max, ob->obmat, 0);
+			if (changed) {
 				minmax_v3v3_v3(min_r, max_r, ob_min);
 				minmax_v3v3_v3(min_r, max_r, ob_max);
 			}
@@ -2493,7 +2493,7 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us
 		}
 	}
 
-	if (change == FALSE) {
+	if (changed == false) {
 		float size[3];
 
 		copy_v3_v3(size, ob->size);
@@ -2539,7 +2539,7 @@ bool BKE_object_minmax_dupli(Scene *scene, Object *ob, float r_min[3], float r_m
 						minmax_v3v3_v3(r_min, r_max, vec);
 					}
 
-					ok = TRUE;
+					ok = true;
 				}
 			}
 		}
diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c
index 64470542844..8e92f86502e 100644
--- a/source/blender/blenkernel/intern/unit.c
+++ b/source/blender/blenkernel/intern/unit.c
@@ -599,7 +599,7 @@ int bUnit_ReplaceString(char *str, int len_max, const char *str_prev, double sca
 
 	bUnitDef *unit;
 	char str_tmp[TEMP_STR_SIZE];
-	int change = 0;
+	int changed = 0;
 
 	if (usys == NULL || usys->units[0].name == NULL) {
 		return 0;
@@ -618,7 +618,7 @@ int bUnit_ReplaceString(char *str, int len_max, const char *str_prev, double sca
 	for (unit = usys->units; unit->name; unit++) {
 		/* in case there are multiple instances */
 		while (unit_replace(str, len_max, str_tmp, scale_pref, unit))
-			change = 1;
+			changed = true;
 	}
 	unit = NULL;
 
@@ -635,7 +635,7 @@ int bUnit_ReplaceString(char *str, int len_max, const char *str_prev, double sca
 						int ofs = 0;
 						/* in case there are multiple instances */
 						while ((ofs = unit_replace(str + ofs, len_max - ofs, str_tmp, scale_pref, unit)))
-							change = 1;
+							changed = true;
 					}
 				}
 			}
@@ -643,7 +643,7 @@ int bUnit_ReplaceString(char *str, int len_max, const char *str_prev, double sca
 	}
 	unit = NULL;
 
-	if (change == 0) {
+	if (changed == 0) {
 		/* no units given so infer a unit from the previous string or default */
 		if (str_prev) {
 			/* see which units the original value had */
@@ -701,7 +701,7 @@ int bUnit_ReplaceString(char *str, int len_max, const char *str_prev, double sca
 		}
 	}
 
-	return change;
+	return changed;
 }
 
 /* 45µm --> 45um */