diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2018-05-01 17:26:31 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2018-05-01 17:26:31 +0300 |
commit | be88f23b834b9f9e9c7c71215284a4c1f6fe0f66 (patch) | |
tree | 2b4ae33becdfad1bad93ab22c8dc507489e76e50 | |
parent | 0be4b0f7a53b90603cc781a48a8b837ee775f87f (diff) |
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
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 8 | ||||
-rw-r--r-- | source/blender/draw/modes/shaders/paint_wire_vert.glsl | 3 |
2 files changed, 11 insertions, 0 deletions
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; } |