Code cleanup: suffix vars to make obvious they are squared

3 files changed, 19 insertions, 19 deletions

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 59cb050a335..a7d2ee35be3 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -5273,8 +5273,8 @@ static void calcNonProportionalEdgeSlide(TransInfo *t, EdgeSlideData *sld, const
 		int i = 0;
 
 		float v_proj[2];
-		float dist = 0;
-		float min_dist = FLT_MAX;
+		float dist_sq = 0;
+		float dist_min_sq = FLT_MAX;
 
 		if (t->spacetype == SPACE_VIEW3D) {
 			/* background mode support */
@@ -5294,9 +5294,9 @@ static void calcNonProportionalEdgeSlide(TransInfo *t, EdgeSlideData *sld, const
 			sv->edge_len = len_v3v3(sv->dir_a, sv->dir_b);
 
 			ED_view3d_project_float_v2_m4(ar, sv->v->co, v_proj, projectMat);
-			dist = len_squared_v2v2(mval, v_proj);
-			if (dist < min_dist) {
-				min_dist = dist;
+			dist_sq = len_squared_v2v2(mval, v_proj);
+			if (dist_sq < dist_min_sq) {
+				dist_min_sq = dist_sq;
 				sld->curr_sv_index = i;
 			}
 		}
@@ -6249,14 +6249,14 @@ static void calcVertSlideMouseActiveVert(struct TransInfo *t, const int mval[2])
 	TransDataVertSlideVert *sv;
 
 	/* set the vertex to use as a reference for the mouse direction 'curr_sv_index' */
-	float dist = 0.0f;
-	float min_dist = FLT_MAX;
+	float dist_sq = 0.0f;
+	float dist_min_sq = FLT_MAX;
 	int i;
 
 	for (i = 0, sv = sld->sv; i < sld->totsv; i++, sv++) {
-		dist = len_squared_v2v2(mval_fl, sv->co_orig_2d);
-		if (dist < min_dist) {
-			min_dist = dist;
+		dist_sq = len_squared_v2v2(mval_fl, sv->co_orig_2d);
+		if (dist_sq < dist_min_sq) {
+			dist_min_sq = dist_sq;
 			sld->curr_sv_index = i;
 		}
 	}
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 3163e8ffce4..2103073d5e9 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -238,7 +238,7 @@ static void set_prop_dist(TransInfo *t, const bool with_dist)
 		if ((tob->flag & TD_SELECTED) == 0) {
 			TransData *td;
 			int i;
-			float dist, vec[3];
+			float dist_sq, vec[3];
 
 			tob->rdist = -1.0f; // signal for next loop
 
@@ -253,9 +253,9 @@ static void set_prop_dist(TransInfo *t, const bool with_dist)
 						sub_v3_v3(vec, vec_p);
 					}
 
-					dist = len_squared_v3(vec);
-					if ((tob->rdist == -1.0f) || (dist < (tob->rdist * tob->rdist))) {
-						tob->rdist = sqrtf(dist);
+					dist_sq = len_squared_v3(vec);
+					if ((tob->rdist == -1.0f) || (dist_sq < (tob->rdist * tob->rdist))) {
+						tob->rdist = sqrtf(dist_sq);
 					}
 				}
 				else {
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index 4a6f4c31a90..9f48dc8995c 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -680,22 +680,22 @@ eRedrawFlag updateSelectedSnapPoint(TransInfo *t)
 
 	if (t->tsnap.status & MULTI_POINTS) {
 		TransSnapPoint *p, *closest_p = NULL;
-		float closest_dist = TRANSFORM_SNAP_MAX_PX;
+		float dist_min_sq = TRANSFORM_SNAP_MAX_PX;
 		const float mval_fl[2] = {t->mval[0], t->mval[1]};
 		float screen_loc[2];
 
 		for (p = t->tsnap.points.first; p; p = p->next) {
-			float dist;
+			float dist_sq;
 
 			if (ED_view3d_project_float_global(t->ar, p->co, screen_loc, V3D_PROJ_TEST_NOP) != V3D_PROJ_RET_OK) {
 				continue;
 			}
 
-			dist = len_squared_v2v2(mval_fl, screen_loc);
+			dist_sq = len_squared_v2v2(mval_fl, screen_loc);
 
-			if (dist < closest_dist) {
+			if (dist_sq < dist_min_sq) {
 				closest_p = p;
-				closest_dist = dist;
+				dist_min_sq = dist_sq;
 			}
 		}