archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T48456: 2x pixel size clamps min brush size

Browse Source 
Using double pixel size prevented 1px brushes

D2044 by @jeske
This commit is contained in:
Campbell Barton
2016-06-03 01:07:29 +10:00
parent 68d1348ca2
commit c5b2f12b36
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/brush.c
View File

@@ -852,7 +852,7 @@ int BKE_brush_size_get(const Scene *scene, const Brush *brush)
UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings; UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings;
int size = (ups->flag & UNIFIED_PAINT_SIZE) ? ups->size : brush->size; int size = (ups->flag & UNIFIED_PAINT_SIZE) ? ups->size : brush->size;
return (int)((float)size * U.pixelsize); return size;
} }
int BKE_brush_use_locked_size(const Scene *scene, const Brush *brush) int BKE_brush_use_locked_size(const Scene *scene, const Brush *brush)

2
source/blender/editors/sculpt_paint/paint_cursor.c
View File

@@ -1016,7 +1016,7 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused))
translation[1] = y; translation[1] = y;
outline_alpha = 0.5; outline_alpha = 0.5;
outline_col = brush->add_col; outline_col = brush->add_col;
final_radius = BKE_brush_size_get(scene, brush) * zoomx; final_radius = (BKE_brush_size_get(scene, brush) * zoomx) / U.pixelsize;
/* don't calculate rake angles while a stroke is active because the rake variables are global and /* don't calculate rake angles while a stroke is active because the rake variables are global and
* we may get interference with the stroke itself. For line strokes, such interference is visible */ * we may get interference with the stroke itself. For line strokes, such interference is visible */