diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2018-06-19 15:32:09 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2018-06-19 15:32:52 +0300 |
commit | ce0a87a2089c32db867930418f60ebaa7acc1604 (patch) | |
tree | 7f716d95635ce996dc05d5ff40297832e9e15d71 /source/blender/draw | |
parent | 92823275af65c64e6edfeca3c513d64f5445640c (diff) |
Revert: EditMode Inactive edge drawing
Did it manually as there was some refactoring done that has value
Diffstat (limited to 'source/blender/draw')
4 files changed, 1 insertions, 8 deletions
diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c index 4bcbb2110e7..d40378dec2d 100644 --- a/source/blender/draw/intern/draw_common.c +++ b/source/blender/draw/intern/draw_common.c @@ -50,7 +50,6 @@ struct GPUTexture *globals_ramp = NULL; void DRW_globals_update(void) { UI_GetThemeColor4fv(TH_WIRE, ts.colorWire); - UI_GetThemeColor4fv(TH_WIRE_INACTIVE, ts.colorWireInactive); UI_GetThemeColor4fv(TH_WIRE_EDIT, ts.colorWireEdit); UI_GetThemeColor4fv(TH_ACTIVE, ts.colorActive); UI_GetThemeColor4fv(TH_SELECT, ts.colorSelect); diff --git a/source/blender/draw/intern/draw_common.h b/source/blender/draw/intern/draw_common.h index 5e29831624b..6227130fb05 100644 --- a/source/blender/draw/intern/draw_common.h +++ b/source/blender/draw/intern/draw_common.h @@ -41,7 +41,6 @@ struct PTCacheEdit; typedef struct GlobalsUboStorage { /* UBOs data needs to be 16 byte aligned (size of vec4) */ float colorWire[4]; - float colorWireInactive[4]; float colorWireEdit[4]; float colorActive[4]; float colorSelect[4]; 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 } } |