From 671797e22e1a5d2cb9f7df9d30012d8a38962ad2 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 18 May 2018 23:14:56 +0200 Subject: [PATCH] Correct last commit --- release/scripts/startup/bl_operators/wm.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index 2f1cf4dc1db..3e2e31e1ef1 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -2361,14 +2361,14 @@ class WM_OT_toolbar(Operator): bl_label = "Toolbar" def execute(self, context): + space_type = context.space_data.type + from bl_ui.space_toolsystem_common import ToolSelectPanelHelper + cls = ToolSelectPanelHelper._tool_class_from_space_type(space_type) + if cls is None: + self.report({'WARNING'}, "Toolbar not found for {space_type!r}") + return {'CANCELLED'} def draw_menu(popover, context): - from bl_ui.space_toolsystem_common import ToolSelectPanelHelper - space_type = context.space_data.type - cls = ToolSelectPanelHelper._tool_class_from_space_type(space_type) - if cls is None: - self.report({'WARNING'}, "Toolbar not found for {space_type!r}") - return {'CANCELLED'} cls.draw_cls(popover.layout, context, detect_layout=False) wm = context.window_manager