[Bf-blender-cvs] [1dac00f7ad1] blender2.8: Fix T58551: Dragged in images do not display orange highlight border when selected

[Clément Foucault]

Commit: 1dac00f7ad179287c873b50e9a038117d4141805
Author: Clément Foucault
Date:   Wed Dec 5 03:45:02 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB1dac00f7ad179287c873b50e9a038117d4141805

Fix T58551: Dragged in images do not display orange highlight border when selected

===================================================================

M	source/blender/draw/modes/object_mode.c
M	source/blender/draw/modes/shaders/object_empty_image_vert.glsl

===================================================================

diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 8b91aff2969..90d499aebd6 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -895,7 +895,7 @@ static void DRW_shgroup_empty_image(
 		DRW_shgroup_uniform_int_copy(grp, "depthMode", ob->empty_image_depth);
 		DRW_shgroup_uniform_float(grp, "size", &ob->empty_drawsize, 1);
 		DRW_shgroup_uniform_vec2(grp, "offset", ob->ima_ofs, 1);
-		DRW_shgroup_uniform_vec4(grp, "color", color, 1);
+		DRW_shgroup_uniform_vec3(grp, "color", color, 1);
 		DRW_shgroup_call_add(grp, DRW_cache_image_plane_wire_get(), ob->obmat);
 	}
 }
diff --git a/source/blender/draw/modes/shaders/object_empty_image_vert.glsl b/source/blender/draw/modes/shaders/object_empty_image_vert.glsl
index 3469e37358e..1c1525696fb 100644
--- a/source/blender/draw/modes/shaders/object_empty_image_vert.glsl
+++ b/source/blender/draw/modes/shaders/object_empty_image_vert.glsl
@@ -24,6 +24,7 @@ void main()
 		(pos + offset) * (size * vec2(aspectX, aspectY)),
 		0.0, 1.0);
 #ifdef USE_WIRE
+	gl_Position.z -= 1e-5;
 	finalColor = vec4(color, 1.0);
 #else
 	texCoord_interp = texCoord;