Commit: aa7b013bd5d2462a1753c2695694c95adc3f1bf0
Author: Clément Foucault
Date: Thu Feb 7 17:47:55 2019 +0100
Branches: master
https://developer.blender.org/rBaa7b013bd5d2462a1753c2695694c95adc3f1bf0
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.
===================================================================
M source/blender/draw/modes/shaders/edit_mesh_overlay_common_lib.glsl
===================================================================
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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
