diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-15 21:09:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-15 21:11:35 +0300 |
| commit | e3d88b021c07dc9e864c55d766b305d7d3b8efb8 (patch) | |
| tree | 65ecffa8cd3a9c3f071dc96be30ecf6d54f49b34 /source/blender/draw | |
| parent | 2291ce9f1f59d10a10badf77c3b1ff75dddc8336 (diff) | |
Edit Mesh: tweak vertex size & edge width
- Vertex size now matches the theme setting.
- Edge width is closer to a single pixel line.
- Face dot was scaled up to be drawn as a circle,
but is currently a square.
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/intern/draw_common.c | 4 | ||||
| -rw-r--r-- | source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c index f32dc5fadaa..4bcbb2110e7 100644 --- a/source/blender/draw/intern/draw_common.c +++ b/source/blender/draw/intern/draw_common.c @@ -120,8 +120,8 @@ 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 = ceilf(UI_GetThemeValuef(TH_VERTEX_SIZE) * (float)M_SQRT2 / 2.0f); - ts.sizeFaceDot = ceilf(UI_GetThemeValuef(TH_FACEDOT_SIZE) * (float)M_SQRT2); + 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); diff --git a/source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl b/source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl index 203e7c3dddc..05b74e9217a 100644 --- a/source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl +++ b/source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl @@ -47,7 +47,7 @@ out vec4 FragColor; /* Vertex flag is shifted and combined with the edge flag */ #define FACE_ACTIVE (1 << (2 + 8)) -#define LARGE_EDGE_SIZE 3.0 +#define LARGE_EDGE_SIZE 2.0 /* Style Parameters in pixel */ @@ -154,7 +154,7 @@ void main() /* Inner thin edge */ float innerEdge = e[v] - sizeEdge; #ifdef ANTI_ALIASING - innerEdge += 0.125; + innerEdge += 0.4; #endif #ifdef VERTEX_SELECTION |