From 84cc111e8b16ddcba4dde70122015c845eeefc77 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 30 Aug 2018 14:28:50 +1000 Subject: 3D View: scale edit-mesh drawing by pixel size --- source/blender/draw/intern/draw_common.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to '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); -- cgit v1.2.3