diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-05-31 22:45:26 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-31 22:45:26 +0300 |
commit | 995fa1f4c0b1dc746b0978033b41984a653784e4 (patch) | |
tree | 65f02fd604184a901a191d1314a3b05bfb489577 /release/scripts/startup | |
parent | 14dee6d7a59f16761201798f85e60d09bd353750 (diff) |
UI: new tool properties space type
This currently shows panels that were in the 2.79 3D view toolbar
which are now popovers.
In some cases it's useful for these to stay open.
This commit adds a space type to do this.
Note this is currently empty in object mode.
Diffstat (limited to 'release/scripts/startup')
-rw-r--r-- | release/scripts/startup/bl_ui/space_properties.py | 4 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_topbar.py | 30 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 10 |
3 files changed, 23 insertions, 21 deletions
diff --git a/release/scripts/startup/bl_ui/space_properties.py b/release/scripts/startup/bl_ui/space_properties.py index 20cb5719e20..cd7137e0254 100644 --- a/release/scripts/startup/bl_ui/space_properties.py +++ b/release/scripts/startup/bl_ui/space_properties.py @@ -31,7 +31,9 @@ class PROPERTIES_HT_header(Header): row = layout.row() row.template_header() - row.prop(view, "context", expand=True, icon_only=True) + + if view.mode == 'DATA_PROPERTIES': + row.prop(view, "context", expand=True, icon_only=True) classes = ( diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py index 53acc29dfad..243b36bdeb7 100644 --- a/release/scripts/startup/bl_ui/space_topbar.py +++ b/release/scripts/startup/bl_ui/space_topbar.py @@ -125,13 +125,13 @@ class TOPBAR_HT_lower_bar(Header): # Note: general mode options should be added to 'draw_right'. if mode == 'SCULPT': - layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".paint_common", category="") + layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".paint_common", category="") elif mode == 'PAINT_VERTEX': - layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".paint_common", category="") + layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".paint_common", category="") elif mode == 'PAINT_WEIGHT': - layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".paint_common", category="") + layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".paint_common", category="") elif mode == 'PAINT_TEXTURE': - layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".paint_common", category="") + layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".paint_common", category="") elif mode == 'EDIT_ARMATURE': pass elif mode == 'EDIT_CURVE': @@ -139,9 +139,9 @@ class TOPBAR_HT_lower_bar(Header): elif mode == 'EDIT_MESH': pass elif mode == 'POSE': - layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".posemode", category="") + pass elif mode == 'PARTICLE': - layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".paint_common", category="") + pass def draw_right(self, context): layout = self.layout @@ -151,23 +151,23 @@ class TOPBAR_HT_lower_bar(Header): mode = context.mode if mode == 'SCULPT': - layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".sculpt_mode", category="") + layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".sculpt_mode", category="") elif mode == 'PAINT_VERTEX': - layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".vertexpaint", category="") + layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".vertexpaint", category="") elif mode == 'PAINT_WEIGHT': - layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".weightpaint", category="") + layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".weightpaint", category="") elif mode == 'PAINT_TEXTURE': - layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".imagepaint", category="") + layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".imagepaint", category="") elif mode == 'EDIT_ARMATURE': - layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".armature_edit", category="") + layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".armature_edit", category="") elif mode == 'EDIT_CURVE': - layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".curve_edit", category="") + layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".curve_edit", category="") elif mode == 'EDIT_MESH': - layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".mesh_edit", category="") + layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".mesh_edit", category="") elif mode == 'POSE': - layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".posemode", category="") + layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".posemode", category="") elif mode == 'PARTICLE': - layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".particlemode", category="") + layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".particlemode", category="") # 3D View Options, tsk. maybe users aren't always using 3D view? toolsettings = context.tool_settings diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index c38ead16dc8..f6dc64c7df7 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -36,8 +36,8 @@ from .properties_paint_common import ( class View3DPanel: - bl_space_type = 'VIEW_3D' - bl_region_type = 'TOOLS' + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' # **************** standard tool clusters ****************** @@ -69,7 +69,7 @@ def draw_vpaint_symmetry(layout, vpaint): class VIEW3D_PT_tools_meshedit_options(View3DPanel, Panel): - bl_category = "" + bl_category = "Options" bl_context = ".mesh_edit" # dot on purpose (access from topbar) bl_label = "Mesh Options" @@ -188,8 +188,8 @@ class VIEW3D_PT_tools_posemode_options(View3DPanel, Panel): class View3DPaintPanel(UnifiedPaintPanel): - bl_space_type = 'VIEW_3D' - bl_region_type = 'TOOLS' + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' class VIEW3D_PT_imapaint_tools_missing(Panel, View3DPaintPanel): |