[Bf-blender-cvs] [575437ac909] blender2.8: 3D View: fix scale of 3D cursor crosshair

Campbell Barton noreply at git.blender.org
Mon May 21 14:51:59 CEST 2018


Commit: 575437ac909531c40ccb77ff7851c60b7fba49f2
Author: Campbell Barton
Date:   Mon May 21 14:51:10 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB575437ac909531c40ccb77ff7851c60b7fba49f2

3D View: fix scale of 3D cursor crosshair

Interface scale was applied twice.

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

M	source/blender/draw/intern/draw_view.c

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

diff --git a/source/blender/draw/intern/draw_view.c b/source/blender/draw/intern/draw_view.c
index 85146be2d72..fcb3a407d03 100644
--- a/source/blender/draw/intern/draw_view.c
+++ b/source/blender/draw/intern/draw_view.c
@@ -682,7 +682,7 @@ void DRW_draw_cursor(void)
 				immUniformThemeColor3(TH_VIEW_OVERLAY);
 				immBegin(GWN_PRIM_LINES, 12);
 
-				const float scale = ED_view3d_pixel_size(rv3d, cursor->location) * U.dpi_fac * 20;
+				const float scale = ED_view3d_pixel_size(rv3d, cursor->location) * 20;
 
 #define CURSOR_VERT(axis_vec, axis, fac) \
 				immVertex3f( \
@@ -693,7 +693,7 @@ void DRW_draw_cursor(void)
 
 #define CURSOR_EDGE(axis_vec, axis, sign) { \
 					CURSOR_VERT(axis_vec, axis, sign 1.0f); \
-					CURSOR_VERT(axis_vec, axis, sign 0.3f); \
+					CURSOR_VERT(axis_vec, axis, sign 0.25f); \
 				}
 
 				for (int axis = 0; axis < 3; axis++) {



More information about the Bf-blender-cvs mailing list