archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: remove gpencil label from common code path

Browse Source
This commit is contained in:
Campbell Barton
2018-10-05 13:55:08 +10:00
parent 1b7b6d9060
commit 9f7c7cb98e
1 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -173,16 +173,6 @@ class TOPBAR_HT_lower_bar(Header):
# we just want them not to be confused with tool options. # we just want them not to be confused with tool options.
mode = context.mode mode = context.mode
# grease pencil layer
gpl = context.active_gpencil_layer
if gpl and gpl.info is not None:
txt = gpl.info
maxw = 25
if len(txt) > maxw:
txt = txt[:maxw - 5] + '..' + txt[-3:]
else:
txt = ""
if mode == 'SCULPT': if mode == 'SCULPT':
layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".sculpt_mode", category="") layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".sculpt_mode", category="")
elif mode == 'PAINT_VERTEX': elif mode == 'PAINT_VERTEX':
@@ -209,26 +199,29 @@ class TOPBAR_HT_lower_bar(Header):
layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".particlemode", category="") layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".particlemode", category="")
elif mode == 'OBJECT': elif mode == 'OBJECT':
layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".objectmode", category="") layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".objectmode", category="")
elif mode == 'GPENCIL_PAINT': elif mode in {'GPENCIL_PAINT', 'GPENCIL_EDIT', 'GPENCIL_SCULPT', 'GPENCIL_WEIGHT'}:
layout.label(text="Layer:") # Grease pencil layer.
sub = layout.row() gpl = context.active_gpencil_layer
sub.ui_units_x = 8 if gpl and gpl.info is not None:
sub.popover( text = gpl.info
panel="TOPBAR_PT_gpencil_layers", maxw = 25
text=txt, if len(text) > maxw:
) text = text[:maxw - 5] + '..' + text[-3:]
else:
text = ""
layout.prop(context.tool_settings, "use_gpencil_draw_onback", text="", icon='ORTHO')
layout.prop(context.tool_settings, "use_gpencil_weight_data_add", text="", icon='WPAINT_HLT')
layout.prop(context.tool_settings, "use_gpencil_additive_drawing", text="", icon='FREEZE')
elif mode in {'GPENCIL_EDIT', 'GPENCIL_SCULPT', 'GPENCIL_WEIGHT'}:
layout.label(text="Layer:") layout.label(text="Layer:")
sub = layout.row() sub = layout.row()
sub.ui_units_x = 8 sub.ui_units_x = 8
sub.popover( sub.popover(
panel="TOPBAR_PT_gpencil_layers", panel="TOPBAR_PT_gpencil_layers",
text=txt, text=text,
) )
if mode == 'GPENCIL_PAINT':
tool_settings = context.tool_settings
layout.prop(tool_settings, "use_gpencil_draw_onback", text="", icon='ORTHO')
layout.prop(tool_settings, "use_gpencil_weight_data_add", text="", icon='WPAINT_HLT')
layout.prop(tool_settings, "use_gpencil_additive_drawing", text="", icon='FREEZE')
class _draw_left_context_mode: class _draw_left_context_mode: