Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-11-20 03:15:37 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-11-20 03:17:36 +0300
commitbb5a96e76ed41e698736aea2c3a4e2897a56fb3b (patch)
tree7d5a129898079134e2a7344cae3b4a342677baf8 /release/scripts/startup/bl_operators
parentf8c16b0175799333f0ddb19478b1e7b834fcf00a (diff)
Cleanup: move toolbar keymap generation to bl_keymap_utils
The function is getting complicated, any refactoring would be best done outside of 'space_toolsystem_common'.
Diffstat (limited to 'release/scripts/startup/bl_operators')
-rw-r--r--release/scripts/startup/bl_operators/wm.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index 36690296b25..8c0174d8f58 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -2390,18 +2390,16 @@ class WM_OT_toolbar(Operator):
return self.execute(context)
def execute(self, context):
- from bl_ui.space_toolsystem_common import (
- ToolSelectPanelHelper,
- keymap_from_context,
- )
- space_type = context.space_data.type
+ from bl_ui.space_toolsystem_common import ToolSelectPanelHelper
+ from bl_keymap_utils import keymap_from_toolbar
+ space_type = context.space_data.type
cls = ToolSelectPanelHelper._tool_class_from_space_type(space_type)
if cls is None:
return {'CANCELLED'}
wm = context.window_manager
- keymap = keymap_from_context(context, space_type)
+ keymap = keymap_from_toolbar.generate(context, space_type)
def draw_menu(popover, context):
layout = popover.layout