From 6b7d03ac036e68bc4017cdb8ce099497641056a2 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 20 Dec 2018 12:02:21 +1100 Subject: Cleanup: remove intermediate menu drawing function --- release/scripts/startup/bl_ui/space_clip.py | 10 ++-------- release/scripts/startup/bl_ui/space_console.py | 5 +---- release/scripts/startup/bl_ui/space_dopesheet.py | 5 +---- release/scripts/startup/bl_ui/space_graph.py | 5 +---- release/scripts/startup/bl_ui/space_image.py | 5 +---- release/scripts/startup/bl_ui/space_nla.py | 5 +---- release/scripts/startup/bl_ui/space_node.py | 5 +---- release/scripts/startup/bl_ui/space_outliner.py | 5 +---- release/scripts/startup/bl_ui/space_sequencer.py | 5 +---- release/scripts/startup/bl_ui/space_text.py | 5 +---- release/scripts/startup/bl_ui/space_time.py | 6 ++---- release/scripts/startup/bl_ui/space_topbar.py | 5 +---- release/scripts/startup/bl_ui/space_view3d.py | 5 +---- 13 files changed, 15 insertions(+), 56 deletions(-) (limited to 'release/scripts') diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 8da033b3a3f..5ec80a59f51 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -283,10 +283,7 @@ class CLIP_MT_tracking_editor_menus(Menu): bl_label = "" def draw(self, context): - self.draw_menus(self.layout, context) - - @staticmethod - def draw_menus(layout, context): + layout = self.layout sc = context.space_data clip = sc.clip @@ -308,10 +305,7 @@ class CLIP_MT_masking_editor_menus(Menu): bl_label = "" def draw(self, context): - self.draw_menus(self.layout, context) - - @staticmethod - def draw_menus(layout, context): + layout = self.layout sc = context.space_data clip = sc.clip diff --git a/release/scripts/startup/bl_ui/space_console.py b/release/scripts/startup/bl_ui/space_console.py index dd5ab03fcba..06349abaaf0 100644 --- a/release/scripts/startup/bl_ui/space_console.py +++ b/release/scripts/startup/bl_ui/space_console.py @@ -39,10 +39,7 @@ class CONSOLE_MT_editor_menus(Menu): bl_label = "" def draw(self, context): - self.draw_menus(self.layout, context) - - @staticmethod - def draw_menus(layout, context): + layout = self.layout layout.menu("CONSOLE_MT_console") diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index f35dea67854..47c5de861ca 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -295,10 +295,7 @@ class DOPESHEET_MT_editor_menus(Menu): bl_label = "" def draw(self, context): - self.draw_menus(self.layout, context) - - @staticmethod - def draw_menus(layout, context): + layout = self.layout st = context.space_data layout.menu("DOPESHEET_MT_view") diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py index ee3f5de0f09..67fe7b22b05 100644 --- a/release/scripts/startup/bl_ui/space_graph.py +++ b/release/scripts/startup/bl_ui/space_graph.py @@ -96,10 +96,7 @@ class GRAPH_MT_editor_menus(Menu): bl_label = "" def draw(self, context): - self.draw_menus(self.layout, context) - - @staticmethod - def draw_menus(layout, context): + layout = self.layout layout.menu("GRAPH_MT_view") layout.menu("GRAPH_MT_select") layout.menu("GRAPH_MT_marker") diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 986423a1c58..38045a9de5e 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -606,10 +606,7 @@ class MASK_MT_editor_menus(Menu): bl_label = "" def draw(self, context): - self.draw_menus(self.layout, context) - - @staticmethod - def draw_menus(layout, context): + layout = self.layout sima = context.space_data ima = sima.image diff --git a/release/scripts/startup/bl_ui/space_nla.py b/release/scripts/startup/bl_ui/space_nla.py index a3179097046..121490b3fcd 100644 --- a/release/scripts/startup/bl_ui/space_nla.py +++ b/release/scripts/startup/bl_ui/space_nla.py @@ -72,10 +72,7 @@ class NLA_MT_editor_menus(Menu): bl_label = "" def draw(self, context): - self.draw_menus(self.layout, context) - - @staticmethod - def draw_menus(layout, context): + layout = self.layout layout.menu("NLA_MT_view") layout.menu("NLA_MT_select") layout.menu("NLA_MT_marker") diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index c5718df3b92..6b407daaccb 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -166,10 +166,7 @@ class NODE_MT_editor_menus(Menu): bl_label = "" def draw(self, context): - self.draw_menus(self.layout, context) - - @staticmethod - def draw_menus(layout, context): + layout = self.layout layout.menu("NODE_MT_view") layout.menu("NODE_MT_select") layout.menu("NODE_MT_add") diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py index 877b81f26ae..4ab990c451b 100644 --- a/release/scripts/startup/bl_ui/space_outliner.py +++ b/release/scripts/startup/bl_ui/space_outliner.py @@ -90,10 +90,7 @@ class OUTLINER_MT_editor_menus(Menu): bl_label = "" def draw(self, context): - self.draw_menus(self.layout, context) - - @staticmethod - def draw_menus(layout, context): + layout = self.layout space = context.space_data if space.display_mode == 'DATA_API': diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index adac167a06d..a018a64e91c 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -136,10 +136,7 @@ class SEQUENCER_MT_editor_menus(Menu): bl_label = "" def draw(self, context): - self.draw_menus(self.layout, context) - - @staticmethod - def draw_menus(layout, context): + layout = self.layout st = context.space_data layout.menu("SEQUENCER_MT_view") diff --git a/release/scripts/startup/bl_ui/space_text.py b/release/scripts/startup/bl_ui/space_text.py index 19b72b99c36..e7ead3f8196 100644 --- a/release/scripts/startup/bl_ui/space_text.py +++ b/release/scripts/startup/bl_ui/space_text.py @@ -91,10 +91,7 @@ class TEXT_MT_editor_menus(Menu): bl_label = "" def draw(self, context): - self.draw_menus(self.layout, context) - - @staticmethod - def draw_menus(layout, context): + layout = self.layout st = context.space_data text = st.text diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py index 47c8381001e..41a1f60c953 100644 --- a/release/scripts/startup/bl_ui/space_time.py +++ b/release/scripts/startup/bl_ui/space_time.py @@ -87,10 +87,8 @@ class TIME_MT_editor_menus(Menu): bl_label = "" def draw(self, context): - self.draw_menus(self.layout, context, horizontal=False) - - @staticmethod - def draw_menus(layout, context, horizontal=True): + layout = self.layout + horizontal = layout.direction == 'HORIZONTAL' if horizontal: row = layout.row() sub = row.row(align=True) diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py index ee5bdb38db7..7b666d86dc1 100644 --- a/release/scripts/startup/bl_ui/space_topbar.py +++ b/release/scripts/startup/bl_ui/space_topbar.py @@ -571,10 +571,7 @@ class TOPBAR_MT_editor_menus(Menu): bl_label = "" def draw(self, context): - self.draw_menus(self.layout, context) - - @staticmethod - def draw_menus(layout, context): + layout = self.layout layout.menu("TOPBAR_MT_file") layout.menu("TOPBAR_MT_edit") diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 7922cdb90ec..d6f27a3e0bc 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -291,10 +291,7 @@ class VIEW3D_MT_editor_menus(Menu): bl_label = "" def draw(self, context): - self.draw_menus(self.layout, context) - - @staticmethod - def draw_menus(layout, context): + layout = self.layout obj = context.active_object mode_string = context.mode edit_object = context.edit_object -- cgit v1.2.3