From 48b1656a6cce6fd7606a671eea9d0d17b67d7445 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 23 Nov 2015 15:44:15 +1100 Subject: Cleanup: shadowing (editors) --- source/blender/editors/sculpt_paint/paint_stroke.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source/blender/editors/sculpt_paint/paint_stroke.c') 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; -- cgit v1.2.3