diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2018-06-22 11:37:38 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2018-06-22 11:43:03 +0300 |
commit | f3501a00e249bc4a7212be1f443704066dd43482 (patch) | |
tree | b6c1c39d2a623022ae8f38d5cdb62a61202339b7 /release | |
parent | c517778a8bf9a0fc8a60541528cbfaf3ec47c679 (diff) |
PaintMode: Full Shading Boolean => Slider
There was a Full Shading bool that was shared across the WP, VP and TP
modes. This commit makes some changes:
- Replace the bool with a factor. This gives the user more control on
the visibility.
- Also draw it on top of the Material and Rendered mode so the user can
control what he needs. In certain cases you don't want to see the final
rendered material, but the actual texture.
- Removed the skipping of objects when in paint modes. As now the paint
modes are blended.
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 2aaeba653fb..dda52a98299 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -4021,12 +4021,20 @@ class VIEW3D_PT_overlay_paint(Panel): bl_space_type = 'VIEW_3D' bl_region_type = 'HEADER' bl_parent_id = 'VIEW3D_PT_overlay' - bl_label = "Paint" + bl_label = "" @classmethod def poll(cls, context): return context.mode in {'PAINT_WEIGHT', 'PAINT_VERTEX', 'PAINT_TEXTURE'} + def draw_header(self, context): + layout = self.layout + layout.label(text={ + "PAINT_TEXTURE": "Texture Paint", + "PAINT_VERTEX": "Vertex Paint", + "PAINT_WEIGHT": "Weight Paint", + }[context.mode]) + def draw(self, context): layout = self.layout view = context.space_data @@ -4036,11 +4044,16 @@ class VIEW3D_PT_overlay_paint(Panel): col = layout.column() col.active = display_all + + col.prop(overlay, { + "PAINT_TEXTURE": "texture_paint_mode_opacity", + "PAINT_VERTEX": "vertex_paint_mode_opacity", + "PAINT_WEIGHT": "weight_paint_mode_opacity", + }[context.mode], text="Opacity") + if context.mode in {'PAINT_WEIGHT', 'PAINT_VERTEX'}: col.prop(overlay, "show_paint_wire") - col.prop(view, "show_mode_shade_override") - class VIEW3D_PT_quad_view(Panel): bl_space_type = 'VIEW_3D' |