quiet some -Wshadow warnings

2 files changed, 11 insertions, 11 deletions

diff --git a/source/blender/editors/mask/mask_add.c b/source/blender/editors/mask/mask_add.c
index a254a6a9278..c929436bc82 100644
--- a/source/blender/editors/mask/mask_add.c
+++ b/source/blender/editors/mask/mask_add.c
@@ -97,7 +97,7 @@ static int find_nearest_diff_point(const bContext *C, Mask *mask, const float no
 				                                                          &tot_diff_point);
 
 				if (diff_points) {
-					int i, tot_point;
+					int j, tot_point;
 					unsigned int tot_feather_point;
 					float *feather_points = NULL, *points;
 
@@ -114,26 +114,26 @@ static int find_nearest_diff_point(const bContext *C, Mask *mask, const float no
 						tot_point = tot_diff_point;
 					}
 
-					for (i = 0; i < tot_point - 1; i++) {
+					for (j = 0; j < tot_point - 1; j++) {
 						float cur_dist, a[2], b[2];
 
-						a[0] = points[2 * i] * scalex;
-						a[1] = points[2 * i + 1] * scaley;
+						a[0] = points[2 * j] * scalex;
+						a[1] = points[2 * j + 1] * scaley;
 
-						b[0] = points[2 * i + 2] * scalex;
-						b[1] = points[2 * i + 3] * scaley;
+						b[0] = points[2 * j + 2] * scalex;
+						b[1] = points[2 * j + 3] * scaley;
 
 						cur_dist = dist_to_line_segment_v2(co, a, b);
 
 						if (cur_dist < dist) {
 							if (tangent)
-								sub_v2_v2v2(tangent, &diff_points[2 * i + 2], &diff_points[2 * i]);
+								sub_v2_v2v2(tangent, &diff_points[2 * j + 2], &diff_points[2 * j]);
 
 							point_masklay = masklay;
 							point_spline = spline;
 							point = use_deform ? &spline->points[(cur_point - spline->points_deform)] : cur_point;
 							dist = cur_dist;
-							u = (float)i / tot_point;
+							u = (float)j / tot_point;
 
 						}
 					}
diff --git a/source/blender/editors/mask/mask_ops.c b/source/blender/editors/mask/mask_ops.c
index 88fbb91edfb..bea6b153d20 100644
--- a/source/blender/editors/mask/mask_ops.c
+++ b/source/blender/editors/mask/mask_ops.c
@@ -483,15 +483,15 @@ static void *slide_point_customdata(bContext *C, wmOperator *op, wmEvent *event)
 		customdata->uw = uw;
 
 		if (uw) {
-			float co[2];
+			float co_uw[2];
 			float weight_scalar = BKE_mask_point_weight_scalar(spline, point, uw->u);
 
 			customdata->weight = uw->w;
 			customdata->weight_scalar = weight_scalar;
-			BKE_mask_point_segment_co(spline, point, uw->u, co);
+			BKE_mask_point_segment_co(spline, point, uw->u, co_uw);
 			BKE_mask_point_normal(spline, point, uw->u, customdata->no);
 
-			madd_v2_v2v2fl(customdata->feather, co, customdata->no, uw->w * weight_scalar);
+			madd_v2_v2v2fl(customdata->feather, co_uw, customdata->no, uw->w * weight_scalar);
 		}
 		else {
 			BezTriple *bezt = &point->bezt;