[Bf-blender-cvs] [be88f23b834] blender2.8: Overlay: Enabled wireframe drawing for vertex/weight paint

[Jeroen Bakker]

Commit: be88f23b834b9f9e9c7c71215284a4c1f6fe0f66
Author: Jeroen Bakker
Date:   Tue May 1 16:26:31 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBbe88f23b834b9f9e9c7c71215284a4c1f6fe0f66

Overlay: Enabled wireframe drawing for vertex/weight paint

This is a temp hack, so that billrey can use blender 2.8 for
drawing the icons. Hack will be phased out by T54910

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

M	release/scripts/startup/bl_ui/space_view3d.py
M	source/blender/draw/modes/shaders/paint_wire_vert.glsl

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 8ab4bbed91f..23ae4118a57 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3592,6 +3592,14 @@ class VIEW3D_PT_overlay(Panel):
 
         col.prop(view, "show_world")
 
+        if context.mode in {'PAINT_WEIGHT', 'PAINT_VERTEX'}:
+            engine_type = {
+                'PAINT_WEIGHT': 'WeightPaintMode',
+                'PAINT_VERTEX': 'VertexPaintMode',
+            }.get(context.mode)
+            engine_props = scene.collection_properties[engine_type]
+            col.prop(engine_props, "use_wire")
+
         if context.mode in {'PAINT_WEIGHT', 'PAINT_VERTEX', 'PAINT_TEXTURE'}:
             col.prop(view, "show_mode_shade_override")
 
diff --git a/source/blender/draw/modes/shaders/paint_wire_vert.glsl b/source/blender/draw/modes/shaders/paint_wire_vert.glsl
index 253c21745e2..e0c3384511f 100644
--- a/source/blender/draw/modes/shaders/paint_wire_vert.glsl
+++ b/source/blender/draw/modes/shaders/paint_wire_vert.glsl
@@ -10,5 +10,8 @@ void main()
 {
 	gl_Position = ModelViewProjectionMatrix * vec4(pos, 1.0);
 
+	/* Temp hack for william to start using blender 2.8 for icons. Will be removed by T54910 */
+	gl_Position.z -= 0.001;
+
 	finalFlag = data;
 }