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:
authorJeroen Bakker <j.bakker@atmind.nl>2018-06-19 15:32:09 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2018-06-19 15:32:52 +0300
commitce0a87a2089c32db867930418f60ebaa7acc1604 (patch)
tree7f716d95635ce996dc05d5ff40297832e9e15d71 /source/blender/draw/modes
parent92823275af65c64e6edfeca3c513d64f5445640c (diff)
Revert: EditMode Inactive edge drawing
Did it manually as there was some refactoring done that has value
Diffstat (limited to 'source/blender/draw/modes')
-rw-r--r--source/blender/draw/modes/shaders/common_globals_lib.glsl1
-rw-r--r--source/blender/draw/modes/shaders/edit_mesh_overlay_common_lib.glsl6
2 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/draw/modes/shaders/common_globals_lib.glsl b/source/blender/draw/modes/shaders/common_globals_lib.glsl
index f8a8f3b9203..c55457bb6d2 100644
--- a/source/blender/draw/modes/shaders/common_globals_lib.glsl
+++ b/source/blender/draw/modes/shaders/common_globals_lib.glsl
@@ -2,7 +2,6 @@
/* keep in sync with GlobalsUboStorage */
layout(std140) uniform globalsBlock {
vec4 colorWire;
- vec4 colorWireInactive;
vec4 colorWireEdit;
vec4 colorActive;
vec4 colorSelect;
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 b3eb55baa3a..dabbb4a321a 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
@@ -33,7 +33,7 @@ vec4 EDIT_MESH_edge_color_inner(int edge_flag, bool face_active)
color = ((edge_flag & EDGE_ACTIVE) != 0) ? colorEditMeshActive : color;
#else
- vec4 color = colorWireInactive;
+ vec4 color = colorWireEdit;
color = ((edge_flag & EDGE_SELECTED) != 0) ? colorEdgeSelect : color;
#endif
return color;
@@ -46,10 +46,6 @@ vec4 EDIT_MESH_vertex_color(int vertex_flag)
return colorEdgeSelect;
}
else {
-#ifdef EDGE_SELECTION
return colorWireEdit;
-#else
- return colorWireInactive;
-#endif
}
}