Code cleanup: suffix vars to make obvious they are squared

2 files changed, 17 insertions, 17 deletions

diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c
index 32abf8dcb19..83b53e208c0 100644
--- a/source/blender/modifiers/intern/MOD_solidify.c
+++ b/source/blender/modifiers/intern/MOD_solidify.c
@@ -425,12 +425,12 @@ static DerivedMesh *applyModifier(
 		const float offset_sq = offset * offset;
 
 		if (do_clamp) {
-			vert_lens = MEM_callocN(sizeof(float) * numVerts, "vert_lens");
+			vert_lens = MEM_mallocN(sizeof(float) * numVerts, "vert_lens");
 			fill_vn_fl(vert_lens, (int)numVerts, FLT_MAX);
 			for (i = 0; i < numEdges; i++) {
-				const float ed_len = len_squared_v3v3(mvert[medge[i].v1].co, mvert[medge[i].v2].co);
-				vert_lens[medge[i].v1] = min_ff(vert_lens[medge[i].v1], ed_len);
-				vert_lens[medge[i].v2] = min_ff(vert_lens[medge[i].v2], ed_len);
+				const float ed_len_sq = len_squared_v3v3(mvert[medge[i].v1].co, mvert[medge[i].v2].co);
+				vert_lens[medge[i].v1] = min_ff(vert_lens[medge[i].v1], ed_len_sq);
+				vert_lens[medge[i].v2] = min_ff(vert_lens[medge[i].v2], ed_len_sq);
 			}
 		}
 
@@ -578,22 +578,22 @@ static DerivedMesh *applyModifier(
 		}
 
 		if (do_clamp) {
-			float *vert_lens = MEM_callocN(sizeof(float) * numVerts, "vert_lens");
+			float *vert_lens_sq = MEM_callocN(sizeof(float) * numVerts, "vert_lens");
 			const float offset    = fabsf(smd->offset) * smd->offset_clamp;
 			const float offset_sq = offset * offset;
-			fill_vn_fl(vert_lens, (int)numVerts, FLT_MAX);
+			fill_vn_fl(vert_lens_sq, (int)numVerts, FLT_MAX);
 			for (i = 0; i < numEdges; i++) {
 				const float ed_len = len_squared_v3v3(mvert[medge[i].v1].co, mvert[medge[i].v2].co);
-				vert_lens[medge[i].v1] = min_ff(vert_lens[medge[i].v1], ed_len);
-				vert_lens[medge[i].v2] = min_ff(vert_lens[medge[i].v2], ed_len);
+				vert_lens_sq[medge[i].v1] = min_ff(vert_lens_sq[medge[i].v1], ed_len);
+				vert_lens_sq[medge[i].v2] = min_ff(vert_lens_sq[medge[i].v2], ed_len);
 			}
 			for (i = 0; i < numVerts; i++) {
-				if (vert_lens[i] < offset_sq) {
-					float scalar = sqrtf(vert_lens[i]) / offset;
+				if (vert_lens_sq[i] < offset_sq) {
+					float scalar = sqrtf(vert_lens_sq[i]) / offset;
 					vert_angles[i] *= scalar;
 				}
 			}
-			MEM_freeN(vert_lens);
+			MEM_freeN(vert_lens_sq);
 		}
 
 		if (ofs_new) {
diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c
index 4ee8494496d..63019770942 100644
--- a/source/blender/modifiers/intern/MOD_weightvgproximity.c
+++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c
@@ -131,22 +131,22 @@ static void get_vert2geom_distance(int numVerts, float (*v_cos)[3],
 		 * This will lead in prunning of the search tree.
 		 */
 		if (dist_v) {
-			nearest_v.dist = nearest_v.index != -1 ? len_squared_v3v3(tmp_co, nearest_v.co) : FLT_MAX;
+			nearest_v.dist_sq = nearest_v.index != -1 ? len_squared_v3v3(tmp_co, nearest_v.co) : FLT_MAX;
 			/* Compute and store result. If invalid (-1 idx), keep FLT_MAX dist. */
 			BLI_bvhtree_find_nearest(treeData_v.tree, tmp_co, &nearest_v, treeData_v.nearest_callback, &treeData_v);
-			dist_v[i] = sqrtf(nearest_v.dist);
+			dist_v[i] = sqrtf(nearest_v.dist_sq);
 		}
 		if (dist_e) {
-			nearest_e.dist = nearest_e.index != -1 ? len_squared_v3v3(tmp_co, nearest_e.co) : FLT_MAX;
+			nearest_e.dist_sq = nearest_e.index != -1 ? len_squared_v3v3(tmp_co, nearest_e.co) : FLT_MAX;
 			/* Compute and store result. If invalid (-1 idx), keep FLT_MAX dist. */
 			BLI_bvhtree_find_nearest(treeData_e.tree, tmp_co, &nearest_e, treeData_e.nearest_callback, &treeData_e);
-			dist_e[i] = sqrtf(nearest_e.dist);
+			dist_e[i] = sqrtf(nearest_e.dist_sq);
 		}
 		if (dist_f) {
-			nearest_f.dist = nearest_f.index != -1 ? len_squared_v3v3(tmp_co, nearest_f.co) : FLT_MAX;
+			nearest_f.dist_sq = nearest_f.index != -1 ? len_squared_v3v3(tmp_co, nearest_f.co) : FLT_MAX;
 			/* Compute and store result. If invalid (-1 idx), keep FLT_MAX dist. */
 			BLI_bvhtree_find_nearest(treeData_f.tree, tmp_co, &nearest_f, treeData_f.nearest_callback, &treeData_f);
-			dist_f[i] = sqrtf(nearest_f.dist);
+			dist_f[i] = sqrtf(nearest_f.dist_sq);
 		}
 	}