Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2019-04-17 03:52:15 +0300
committerClément Foucault <foucault.clem@gmail.com>2019-04-17 20:37:12 +0300
commit1a4b60c30db319b71bdc2e2fed2612c873fa8757 (patch)
treefc7274d7607ba0f3a821b0a14c7a752bfa42f342 /source/blender/draw/modes/shaders/edit_mesh_overlay_geom.glsl
parent106aea0c936fc6446e1a7eb45b52c5a67cbd4584 (diff)
Edit Mode: Rework display to differentiate selection modes
This removes the large edges and instead use colors to hint in which selection mode the user is. The component in each individual selection mode is more prominent to add more emphasis. The other components are less prominent and dimmed. A minor default theme changes needed to be made to keep clarity in all combinations. Forcing old behavior (no selection mode hit) could be done quite easily by just making the 2 booleans true (selectFaces and selectEdges). Reviewers: campbellbarton, billreynish Reviewed By: campbellbarton, billreynish Subscribers: ThinkingPolygons Maniphest Tasks: T1234 Differential Revision: https://developer.blender.org/D4526
Diffstat (limited to 'source/blender/draw/modes/shaders/edit_mesh_overlay_geom.glsl')
-rw-r--r--source/blender/draw/modes/shaders/edit_mesh_overlay_geom.glsl5
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/draw/modes/shaders/edit_mesh_overlay_geom.glsl b/source/blender/draw/modes/shaders/edit_mesh_overlay_geom.glsl
index 6e59de12260..f25724d2e91 100644
--- a/source/blender/draw/modes/shaders/edit_mesh_overlay_geom.glsl
+++ b/source/blender/draw/modes/shaders/edit_mesh_overlay_geom.glsl
@@ -4,7 +4,6 @@ layout(triangle_strip, max_vertices = 4) out;
uniform vec2 viewportSize;
uniform vec2 viewportSizeInv;
-uniform float edgeScale;
in vec4 finalColor[2];
in vec4 finalColorOuter[2];
@@ -57,9 +56,9 @@ void main()
line = abs(line) * viewportSize;
finalColorOuter_f = finalColorOuter[0];
- float half_size = sizeEdge * edgeScale;
+ float half_size = sizeEdge;
/* Enlarge edge for flag display. */
- half_size += (finalColorOuter_f.a > 0.0) ? max(sizeEdge * edgeScale, 1.0) : 0.0;
+ half_size += (finalColorOuter_f.a > 0.0) ? max(sizeEdge, 1.0) : 0.0;
#ifdef USE_SMOOTH_WIRE
/* Add 1 px for AA */