diff options
author | Ton Roosendaal <ton@blender.org> | 2013-01-22 19:30:29 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2013-01-22 19:30:29 +0400 |
commit | e7ed4605eb9770ec31b9bd33ed386a1f9bcfb1c3 (patch) | |
tree | e30c8bd35915569c7632009852eba1c13eb3927b /source/blender/blenkernel | |
parent | 711c0e4fddaa8013261ca51c04ecf0c95fdbd1c9 (diff) |
Bugfix #33945
OSX: in HiDPI mode, the brush circle doubled on every use.
Was caused by new code storing and setting brush sizes.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/brush.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 792a6058872..70eaa00b82e 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -662,7 +662,9 @@ void BKE_brush_imbuf_new(const Scene *scene, Brush *brush, short flt, short texf void BKE_brush_size_set(Scene *scene, Brush *brush, int size) { UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings; - + + size = (int)((float)size / U.pixelsize); + if (ups->flag & UNIFIED_PAINT_SIZE) ups->size = size; else |