Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-11-23 07:44:15 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-11-23 09:40:50 +0300
commit48b1656a6cce6fd7606a671eea9d0d17b67d7445 (patch)
treed95ed94cf1d1934c01de44364db7d53ca2262ff3 /source/blender/editors/sculpt_paint/paint_stroke.c
parent6e4cb463c44ab57331cda7ded645b4faa573bbb3 (diff)
Cleanup: shadowing (editors)
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_stroke.c')
-rw-r--r--source/blender/editors/sculpt_paint/paint_stroke.c3
1 files changed, 1 insertions, 2 deletions
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;