kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

UI: move general mode options to right of topbar

Browse Source
This commit is contained in:
Campbell Barton 2018-05-12 14:43:29 +02:00
parent 570455fb83
commit b4010005de
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
release/scripts/startup/bl_ui/space_topbar.py
View File

@ -147,36 +147,53 @@ class TOPBAR_HT_lower_bar(Header):
if draw_fn is not None:
draw_fn(context, layout)
# 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='VIEW_3D', region_type='TOOLS', context=".sculpt_mode", category="")
elif mode == 'PAINT_VERTEX':
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".paint_common", category="")
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".vertexpaint", category="")
elif mode == 'PAINT_WEIGHT':
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".paint_common", category="")
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".weightpaint", category="")
elif mode == 'PAINT_TEXTURE':
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".paint_common", category="")
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".imagepaint", category="")
elif mode == 'EDIT_ARMATURE':
pass
elif mode == 'EDIT_CURVE':
pass
elif mode == 'EDIT_MESH':
pass
elif mode == 'POSE':
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".posemode", category="")
elif mode == 'PARTICLE':
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".paint_common", category="")
def draw_right(self, context):
layout = self.layout
# General options, note, these _could_ display at the RHS of the draw_left callback.
# we just want them not to be confused with tool options.
mode = context.mode
if mode == 'SCULPT':
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".sculpt_mode", category="")
elif mode == 'PAINT_VERTEX':
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".vertexpaint", category="")
elif mode == 'PAINT_WEIGHT':
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".weightpaint", category="")
elif mode == 'PAINT_TEXTURE':
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".imagepaint", category="")
elif mode == 'EDIT_ARMATURE':
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".armature_edit", category="")
elif mode == 'EDIT_CURVE':
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".curve_edit", category="")
elif mode == 'EDIT_MESH':
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".mesh_edit", category="")
elif mode == 'POSE':
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".posemode", category="")
elif mode == 'PARTICLE':
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".paint_common", category="")
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".particlemode", category="")
def draw_right(self, context):
layout = self.layout
# Command Settings (redo)
op = context.active_operator
row = layout.row()