diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2018-04-17 23:11:56 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2018-04-17 23:11:56 +0300 |
commit | 3f762dd76409a285bc0f40df0ff8a6bae6d065b0 (patch) | |
tree | 9fbaf7813ea25c34c3dfa0a76d876dec30992f05 /release | |
parent | dd8d55b31ac693aed0510551d080bbaca9c3cb7e (diff) |
Workbench: clean up the viewport shading code
- added the drawtype_solid, drawtype_wireframe, drawtype_texture to
View3D
- enabled workbench panels for important render engines
- merged workbench_materials to solid_flat_mode. All draw modes will get
its own fast implementation in the workbench
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_collection.py | 7 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 4 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 5 |
3 files changed, 7 insertions, 9 deletions
diff --git a/release/scripts/startup/bl_ui/properties_collection.py b/release/scripts/startup/bl_ui/properties_collection.py index cced6262be5..60f06b57f3c 100644 --- a/release/scripts/startup/bl_ui/properties_collection.py +++ b/release/scripts/startup/bl_ui/properties_collection.py @@ -87,12 +87,7 @@ class COLLECTION_PT_clay_settings(CollectionButtonsPanel, Panel): class COLLECTION_PT_workbench_settings(CollectionButtonsPanel, Panel): - bl_label = "Render Settings" - COMPAT_ENGINES = {'BLENDER_WORKBENCH'} - - @classmethod - def poll(cls, context): - return context.view_render.engine in cls.COMPAT_ENGINES + bl_label = "Workbench Settings" def draw(self, context): layout = self.layout diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 11b71d6cb24..6ba49627579 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -913,8 +913,8 @@ class RENDER_PT_eevee_film(RenderButtonsPanel, Panel): class RENDER_PT_workbench_collection_settings(RenderButtonsPanel, Panel): - bl_label = "Workbench Collection Settings" - COMPAT_ENGINES = {'BLENDER_WORKBENCH'} + bl_label = "Workbench Settings" + COMPAT_ENGINES = {'BLENDER_WORKBENCH', 'BLENDER_EEVEE', 'CYCLES'} def draw(self, context): layout = self.layout diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 4a24beb36c1..48d0451632a 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -46,7 +46,10 @@ class VIEW3D_HT_header(Header): # Contains buttons like Mode, Pivot, Manipulator, Layer, Mesh Select Mode... row = layout layout.template_header_3D() - row.prop(view, "viewport_shade") + row.prop(view, "viewport_shade", text="", icon_only=True) + + if view.viewport_shade == "SOLID": + row.prop(view, "viewport_shade_solid", text="") if obj: mode = obj.mode |