Cleanup: shadowing (editors)

2 files changed, 4 insertions, 5 deletions

diff --git a/source/blender/editors/sculpt_paint/paint_curve.c b/source/blender/editors/sculpt_paint/paint_curve.c
index 2f27db835f5..9704db9d035 100644
--- a/source/blender/editors/sculpt_paint/paint_curve.c
+++ b/source/blender/editors/sculpt_paint/paint_curve.c
@@ -459,7 +459,6 @@ static bool paintcurve_point_select(bContext *C, wmOperator *op, const int loc[2
 	Paint *p = BKE_paint_get_active_from_context(C);
 	Brush *br = p->brush;
 	PaintCurve *pc;
-	PaintCurvePoint *pcp;
 	int i;
 	const float loc_fl[2] = {UNPACK2(loc)};
 
@@ -470,12 +469,13 @@ static bool paintcurve_point_select(bContext *C, wmOperator *op, const int loc[2
 
 	paintcurve_undo_begin(C, op, pc);
 
-	pcp = pc->points;
-
 	if (toggle) {
+		PaintCurvePoint *pcp;
 		char select = 0;
 		bool selected = false;
 
+		pcp = pc->points;
+
 		for (i = 0; i < pc->tot_points; i++) {
 			if (pcp[i].bez.f1 || pcp[i].bez.f2 || pcp[i].bez.f3) {
 				selected = true;
diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c
index b1ddf1172c8..db6ee705343 100644
--- a/source/blender/editors/sculpt_paint/paint_stroke.c
+++ b/source/blender/editors/sculpt_paint/paint_stroke.c
@@ -870,8 +870,7 @@ static void paint_stroke_add_sample(const Paint *paint,
                                     float x, float y, float pressure)
 {
 	PaintSample *sample = &stroke->samples[stroke->cur_sample];
-	int max_samples = MIN2(PAINT_MAX_INPUT_SAMPLES,
-	                       MAX2(paint->num_input_samples, 1));
+	int max_samples = CLAMPIS(paint->num_input_samples, 1, PAINT_MAX_INPUT_SAMPLES);
 
 	sample->mouse[0] = x;
 	sample->mouse[1] = y;