[Bf-blender-cvs] [84cc111e8b1] blender2.8: 3D View: scale edit-mesh drawing by pixel size

Campbell Barton noreply at git.blender.org
Thu Aug 30 06:23:54 CEST 2018


Commit: 84cc111e8b16ddcba4dde70122015c845eeefc77
Author: Campbell Barton
Date:   Thu Aug 30 14:28:50 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB84cc111e8b16ddcba4dde70122015c845eeefc77

3D View: scale edit-mesh drawing by pixel size

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

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

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

diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c
index 30b1ebe07cd..691cd27051a 100644
--- a/source/blender/draw/intern/draw_common.c
+++ b/source/blender/draw/intern/draw_common.c
@@ -119,11 +119,10 @@ void DRW_globals_update(void)
 	ts.sizeLampCircleShadow = ts.sizeLampCircle + U.pixelsize * 3.0f;
 
 	/* M_SQRT2 to be at least the same size of the old square */
-	ts.sizeVertex = max_ff(1.0f, UI_GetThemeValuef(TH_VERTEX_SIZE) * (float)M_SQRT2 / 2.0f);
-	ts.sizeFaceDot = UI_GetThemeValuef(TH_FACEDOT_SIZE);
-	ts.sizeEdge = 1.0f / 2.0f; /* TODO Theme */
-	ts.sizeEdgeFix = 0.5f + 2.0f * (2.0f * (MAX2(ts.sizeVertex, ts.sizeEdge)) * (float)M_SQRT1_2);
-
+	ts.sizeVertex = U.pixelsize * (max_ff(1.0f, UI_GetThemeValuef(TH_VERTEX_SIZE) * (float)M_SQRT2 / 2.0f));
+	ts.sizeFaceDot = U.pixelsize * UI_GetThemeValuef(TH_FACEDOT_SIZE);
+	ts.sizeEdge = U.pixelsize * (1.0f / 2.0f); /* TODO Theme */
+	ts.sizeEdgeFix = U.pixelsize * (0.5f + 2.0f * (2.0f * (MAX2(ts.sizeVertex, ts.sizeEdge)) * (float)M_SQRT1_2));
 
 	if (globals_ubo == NULL) {
 		globals_ubo = DRW_uniformbuffer_create(sizeof(GlobalsUboStorage), &ts);



More information about the Bf-blender-cvs mailing list