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:
authorCampbell Barton <ideasman42@gmail.com>2018-08-30 08:45:58 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-08-30 08:54:23 +0300
commit7dd24ba6e84cf48b0d1ce60abaedfcd94cd5d5f6 (patch)
treefa3db13e3d6071b8778d5497bae3f0a4ecff1969 /source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl
parent84cc111e8b16ddcba4dde70122015c845eeefc77 (diff)
3D View: use thicker edges when in edge-mode
Without this there is no visual differentiation between face/edge mode.
Diffstat (limited to 'source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl')
-rw-r--r--source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl7
1 files changed, 5 insertions, 2 deletions
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 fe9062a8d50..6551fa81c21 100644
--- a/source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl
+++ b/source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl
@@ -10,6 +10,7 @@
* TODO Refine the range to only affect GPUs. */
uniform float faceAlphaMod;
+uniform float edgeScale;
flat in vec3 edgesCrease;
flat in vec3 edgesBweight;
@@ -74,10 +75,12 @@ void main()
FragColor.a *= faceAlphaMod;
/* Edges */
+ float sizeEdgeFinal = sizeEdge * edgeScale;
+
for (int v = 0; v < 3; ++v) {
if ((flag[v] & EDGE_EXISTS) != 0) {
/* Outer large edge */
- float largeEdge = e[v] - sizeEdge * LARGE_EDGE_SIZE;
+ float largeEdge = e[v] - sizeEdgeFinal * LARGE_EDGE_SIZE;
vec4 large_edge_color = EDIT_MESH_edge_color_outer(flag[v], (flag[0]& FACE_ACTIVE) != 0, edgesCrease[v], edgesBweight[v]);
@@ -86,7 +89,7 @@ void main()
}
/* Inner thin edge */
- float innerEdge = e[v] - sizeEdge;
+ float innerEdge = e[v] - sizeEdgeFinal;
#ifdef ANTI_ALIASING
innerEdge += 0.4;
#endif