diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-26 23:56:39 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-26 23:56:39 +0300 |
commit | a61480c27103fbf449fd14ea8061b65c29f19eae (patch) | |
tree | 8d626b465ebe17936b7551aa91cc5b9d3b192607 /release/scripts/startup/bl_ui | |
parent | a3cd57ea8c57c10d4c65ddd51faa6cce14c98e10 (diff) | |
parent | 532c8ac58384309e77791e32ab78f448ad2a76a6 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/startup/bl_ui')
-rw-r--r-- | release/scripts/startup/bl_ui/space_dopesheet.py | 14 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_graph.py | 14 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_nla.py | 14 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_time.py | 20 |
4 files changed, 37 insertions, 25 deletions
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index 7208135f5e6..9ae20ba2194 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -59,6 +59,8 @@ def dopesheet_filter(layout, context, genericFiltersOnly=False): # Generic Layout - Used as base for filtering popovers used in all animation editors # Used for DopeSheet, NLA, and Graph Editors + + class DopesheetFilterPopoverBase: bl_region_type = 'HEADER' bl_label = "Filters" @@ -211,11 +213,13 @@ class DOPESHEET_HT_header(Header): TIME_HT_editor_buttons.draw_header(context, layout) else: layout.prop(st, "ui_mode", text="") - layout.popover(space_type='DOPESHEET_EDITOR', - region_type='HEADER', - panel_type="DOPESHEET_PT_filters", - text="", - icon='FILTER') + layout.popover( + space_type='DOPESHEET_EDITOR', + region_type='HEADER', + panel_type="DOPESHEET_PT_filters", + text="", + icon='FILTER', + ) DOPESHEET_MT_editor_menus.draw_collapsible(context, layout) DOPESHEET_HT_editor_buttons.draw_header(context, layout) diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py index 9a22e0b4bd7..e3ebb99d859 100644 --- a/release/scripts/startup/bl_ui/space_graph.py +++ b/release/scripts/startup/bl_ui/space_graph.py @@ -23,7 +23,7 @@ from bpy.types import Header, Menu, Panel from .space_dopesheet import ( DopesheetFilterPopoverBase, dopesheet_filter, - ) +) class GRAPH_HT_header(Header): @@ -41,11 +41,13 @@ class GRAPH_HT_header(Header): # Now a exposed as a sub-space type # layout.prop(st, "mode", text="") - layout.popover(space_type='GRAPH_EDITOR', - region_type='HEADER', - panel_type="GRAPH_PT_filters", - text="", - icon='FILTER') + layout.popover( + space_type='GRAPH_EDITOR', + region_type='HEADER', + panel_type="GRAPH_PT_filters", + text="", + icon='FILTER', + ) GRAPH_MT_editor_menus.draw_collapsible(context, layout) diff --git a/release/scripts/startup/bl_ui/space_nla.py b/release/scripts/startup/bl_ui/space_nla.py index 9f23420298f..9a5f835d505 100644 --- a/release/scripts/startup/bl_ui/space_nla.py +++ b/release/scripts/startup/bl_ui/space_nla.py @@ -23,7 +23,7 @@ from bpy.types import Header, Menu, Panel from .space_dopesheet import ( DopesheetFilterPopoverBase, dopesheet_filter, - ) +) class NLA_HT_header(Header): @@ -37,11 +37,13 @@ class NLA_HT_header(Header): row = layout.row(align=True) row.template_header() - layout.popover(space_type='NLA_EDITOR', - region_type='HEADER', - panel_type="NLA_PT_filters", - text="", - icon='FILTER') + layout.popover( + space_type='NLA_EDITOR', + region_type='HEADER', + panel_type="NLA_PT_filters", + text="", + icon='FILTER', + ) NLA_MT_editor_menus.draw_collapsible(context, layout) diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py index 358a813fd0f..4616aeb45a4 100644 --- a/release/scripts/startup/bl_ui/space_time.py +++ b/release/scripts/startup/bl_ui/space_time.py @@ -91,14 +91,18 @@ class TIME_MT_editor_menus(Menu): @staticmethod def draw_menus(layout, context): - layout.popover(space_type='DOPESHEET_EDITOR', - region_type='HEADER', - panel_type="TIME_PT_playback", - text="Playback") - layout.popover(space_type='DOPESHEET_EDITOR', - region_type='HEADER', - panel_type="TIME_PT_keyframing_settings", - text="Keying") + layout.popover( + space_type='DOPESHEET_EDITOR', + region_type='HEADER', + panel_type="TIME_PT_playback", + text="Playback", + ) + layout.popover( + space_type='DOPESHEET_EDITOR', + region_type='HEADER', + panel_type="TIME_PT_keyframing_settings", + text="Keying", + ) layout.menu("TIME_MT_view") layout.menu("TIME_MT_marker") |