diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-02-05 21:11:00 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-02-05 21:11:00 +0300 |
| commit | 77698f601021eb557be38945ed74706a325b1c57 (patch) | |
| tree | f6c968732dca8b44c845ad177f03e34d5f480e0b /source/blender/blenkernel/intern/brush.c | |
| parent | a1ec1b3974e81108f5d017d0a1fdcede7419ee99 (diff) | |
Fix T43556 clamp brush size before setting it after division by DPI,
avoids nasty zero size brushes.
Diffstat (limited to 'source/blender/blenkernel/intern/brush.c')
| -rw-r--r-- | source/blender/blenkernel/intern/brush.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 082a4cf34c2..10d77921515 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -810,6 +810,9 @@ void BKE_brush_size_set(Scene *scene, Brush *brush, int size) size = (int)((float)size / U.pixelsize); + /* make sure range is sane */ + CLAMP(size, 1, MAX_BRUSH_PIXEL_RADIUS); + if (ups->flag & UNIFIED_PAINT_SIZE) ups->size = size; else |