blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 743 Projects 19 Wiki Activity

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.
This commit is contained in:
Clément Foucault 2019-02-07 17:47:55 +01:00
parent a710af2b25
commit aa7b013bd5
Notes: blender-bot 2023-02-14 11:20:29 +01:00 
Referenced by commit 9d34a9d7e5, DRW: add back edge highlighting for active face drawing
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/draw/modes/shaders/edit_mesh_overlay_common_lib.glsl
View File

@ -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;