[Bf-blender-cvs] [8bc6f8b] master: Fix T48812: Brush size invalid with HIDPI

[Campbell Barton]

Commit: 8bc6f8bf20ab13abd232ba12f77eb904dfe95d79
Author: Campbell Barton
Date:   Tue Jul 12 01:15:54 2016 +1000
Branches: master
https://developer.blender.org/rB8bc6f8bf20ab13abd232ba12f77eb904dfe95d79

Fix T48812: Brush size invalid with HIDPI

Missed from c5b2f12b

===================================================================

M	source/blender/editors/sculpt_paint/paint_cursor.c
M	source/blender/windowmanager/intern/wm_operators.c

===================================================================

diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c
index eba9448..53c11e2 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) / U.pixelsize;
+	final_radius = (BKE_brush_size_get(scene, brush) * zoomx);
 
 	/* 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 */
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 4bd1bdd..7827361 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -2851,8 +2851,8 @@ void WM_OT_straightline_gesture(wmOperatorType *ot)
 
 /* *********************** radial control ****************** */
 
-#define WM_RADIAL_CONTROL_DISPLAY_SIZE (200 * U.pixelsize)
-#define WM_RADIAL_CONTROL_DISPLAY_MIN_SIZE (35 * U.pixelsize)
+#define WM_RADIAL_CONTROL_DISPLAY_SIZE (200)
+#define WM_RADIAL_CONTROL_DISPLAY_MIN_SIZE (35)
 #define WM_RADIAL_CONTROL_DISPLAY_WIDTH (WM_RADIAL_CONTROL_DISPLAY_SIZE - WM_RADIAL_CONTROL_DISPLAY_MIN_SIZE)
 #define WM_RADIAL_MAX_STR 10
 
@@ -2929,7 +2929,7 @@ static void radial_control_set_initial_mouse(RadialControl *rc, const wmEvent *e
 		case PROP_NONE:
 		case PROP_DISTANCE:
 		case PROP_PIXEL:
-			d[0] = rc->initial_value * U.pixelsize;
+			d[0] = rc->initial_value;
 			break;
 		case PROP_PERCENTAGE:
 			d[0] = (rc->initial_value) / 100.0f * WM_RADIAL_CONTROL_DISPLAY_WIDTH + WM_RADIAL_CONTROL_DISPLAY_MIN_SIZE;
@@ -3055,8 +3055,8 @@ static void radial_control_paint_cursor(bContext *C, int x, int y, void *customd
 		case PROP_NONE:
 		case PROP_DISTANCE:
 		case PROP_PIXEL:
-			r1 = rc->current_value * U.pixelsize;
-			r2 = rc->initial_value * U.pixelsize;
+			r1 = rc->current_value;
+			r2 = rc->initial_value;
 			tex_radius = r1;
 			alpha = 0.75;
 			break;
@@ -3538,7 +3538,6 @@ static int radial_control_modal(bContext *C, wmOperator *op, const wmEvent *even
 						case PROP_PIXEL:
 							new_value = dist;
 							if (snap) new_value = ((int)new_value + 5) / 10 * 10;
-							new_value /= U.pixelsize;
 							break;
 						case PROP_PERCENTAGE:
 							new_value = ((dist - WM_RADIAL_CONTROL_DISPLAY_MIN_SIZE) / WM_RADIAL_CONTROL_DISPLAY_WIDTH) * 100.0f;