diff options
| author | Clément Fukhaut <turjuque@gmail.com> | 2016-06-05 17:29:41 +0300 |
|---|---|---|
| committer | Clément Fukhaut <turjuque@gmail.com> | 2016-06-05 17:29:41 +0300 |
| commit | db461850d7fc03dbd72252c501f602c953c51d97 (patch) | |
| tree | 1fce82d73b684e38a13c83f417414914c0d66947 /source/blender/editors/sculpt_paint | |
| parent | d28c4d4a7cf30f74a6deaf7f148865fe06bae108 (diff) | |
| parent | 04bcaf07dc945578353a8675e1e5003d1c325102 (diff) | |
Merge branch 'master' of git://git.blender.org/blender
# Conflicts:
# source/blender/gpu/shaders/gpu_shader_material.glsl
Diffstat (limited to 'source/blender/editors/sculpt_paint')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_cursor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c index e4e9976c10d..eba9448aa40 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.c +++ b/source/blender/editors/sculpt_paint/paint_cursor.c @@ -1016,7 +1016,7 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused)) translation[1] = y; outline_alpha = 0.5; 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 * we may get interference with the stroke itself. For line strokes, such interference is visible */ |