Edit Mesh: Add back the option to not highlight selected faces/edges

Do note that we force showing the face dot if we are in face select mode
but faces and edges overlays are disable to not loose the selected faces
entirely.

1 files changed, 6 insertions, 10 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 f0981cca9e7..87ee0d7f00f 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
@@ -10,6 +10,7 @@
 #define VERTEX_ACTIVE   (1 << 0)
 #define VERTEX_SELECTED (1 << 1)
 
+uniform bool doEdges = true;
 
 vec4 EDIT_MESH_edge_color_outer(int edge_flag, bool face_active, float crease, float bweight)
 {
@@ -28,24 +29,19 @@ vec4 EDIT_MESH_edge_color_outer(int edge_flag, bool face_active, float crease, f
 
 vec4 EDIT_MESH_edge_color_inner(int edge_flag, bool face_active)
 {
-#ifdef EDGE_SELECTION
 	vec4 color = colorWireEdit;
+#ifdef EDGE_SELECTION
 	color = ((edge_flag & EDGE_SELECTED) != 0) ? colorEdgeSelect : color;
 	color = ((edge_flag & EDGE_ACTIVE) != 0) ? colorEditMeshActive : color;
-
 #else
-	vec4 color = colorWireEdit;
-	color = ((edge_flag & EDGE_SELECTED) != 0) ? colorEdgeSelect : color;
+	color = (doEdges && (edge_flag & EDGE_SELECTED) != 0) ? colorEdgeSelect : color;
 #endif
 	return color;
 }
 
 vec4 EDIT_MESH_vertex_color(int vertex_flag)
 {
-	if ((vertex_flag & (VERTEX_ACTIVE | VERTEX_SELECTED)) != 0) {
-		return colorEdgeSelect;
-	}
-	else {
-		return colorWireEdit;
-	}
+	vec4 color = colorWireEdit;
+	color = (doEdges && (vertex_flag & (VERTEX_ACTIVE | VERTEX_SELECTED)) != 0) ? colorEdgeSelect : color;
+	return color;
 }