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-02-07 19:47:55 +0300
committerClément Foucault <foucault.clem@gmail.com>2019-02-07 19:47:55 +0300
commitaa7b013bd5d2462a1753c2695694c95adc3f1bf0 (patch)
treef804a9dbcc33f84adc317e54b01c5b823632ba9e /source/blender/draw/modes
parenta710af2b2571ce0564ee11cbcf5ebb35e6b09a3c (diff)
Edit Mode: Make active face hint part of the face color
This remove the hint on the face edges. This is because the hint was displayed on both sides and was requiring to draw every edges twice.
Diffstat (limited to 'source/blender/draw/modes')
-rw-r--r--source/blender/draw/modes/shaders/edit_mesh_overlay_common_lib.glsl6
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/draw/modes/shaders/edit_mesh_overlay_common_lib.glsl b/source/blender/draw/modes/shaders/edit_mesh_overlay_common_lib.glsl
index 51b6e628deb..a1b3f9762a0 100644
--- a/source/blender/draw/modes/shaders/edit_mesh_overlay_common_lib.glsl
+++ b/source/blender/draw/modes/shaders/edit_mesh_overlay_common_lib.glsl
@@ -9,10 +9,6 @@ vec4 EDIT_MESH_edge_color_outer(int edge_flag, int face_flag, float crease, floa
color = (crease > 0.0) ? vec4(colorEdgeCrease.rgb, crease) : color;
color = (bweight > 0.0) ? vec4(colorEdgeBWeight.rgb, bweight) : color;
color = ((edge_flag & EDGE_SEAM) != 0) ? colorEdgeSeam : color;
-
- if ((face_flag & FACE_ACTIVE) != 0) {
- color = vec4(colorEditMeshActive.rgb, 1.0);
- }
return color;
}
@@ -47,7 +43,7 @@ vec4 EDIT_MESH_vertex_color(int vertex_flag)
vec4 EDIT_MESH_face_color(int face_flag)
{
if ((face_flag & FACE_ACTIVE) != 0) {
- return colorFaceSelect;
+ return mix(colorFaceSelect, colorEditMeshActive, 0.5);
}
else if ((face_flag & FACE_SELECTED) != 0) {
return colorFaceSelect;