diff options
| -rw-r--r-- | release/scripts/modules/bpy_extras/keyconfig_utils.py | 4 | ||||
| -rw-r--r-- | source/blender/editors/include/UI_interface.h | 3 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_ops.c | 10 | ||||
| -rw-r--r-- | source/blender/editors/space_api/spacetypes.c | 1 |
4 files changed, 18 insertions, 0 deletions
diff --git a/release/scripts/modules/bpy_extras/keyconfig_utils.py b/release/scripts/modules/bpy_extras/keyconfig_utils.py index 72233571702..eef5c2c6e27 100644 --- a/release/scripts/modules/bpy_extras/keyconfig_utils.py +++ b/release/scripts/modules/bpy_extras/keyconfig_utils.py @@ -33,6 +33,10 @@ KM_HIERARCHY = [ ('View2D', 'EMPTY', 'WINDOW', []), # view 2d navigation (per region) ('View2D Buttons List', 'EMPTY', 'WINDOW', []), # view 2d with buttons navigation + ('User Interface', 'EMPTY', 'WINDOW', [ + # empty + ]), + ('3D View', 'VIEW_3D', 'WINDOW', [ # view 3d navigation and generic stuff (select, transform) ('Object Mode', 'EMPTY', 'WINDOW', []), ('Mesh', 'EMPTY', 'WINDOW', []), diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index 11dc88d615d..051400b5e3f 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -62,6 +62,7 @@ struct uiFontStyle; struct uiWidgetColors; struct Image; struct ImageUser; +struct wmKeyConfig; struct wmOperatorType; struct uiWidgetColors; struct MTex; @@ -1004,6 +1005,8 @@ typedef struct uiDragColorHandle { } uiDragColorHandle; void ED_button_operatortypes(void); +void ED_keymap_ui(struct wmKeyConfig *keyconf); + void UI_drop_color_copy(struct wmDrag *drag, struct wmDropBox *drop); int UI_drop_color_poll(struct bContext *C, struct wmDrag *drag, const struct wmEvent *event); diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index c707ac9eb52..5fa77352b52 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -1108,3 +1108,13 @@ void ED_button_operatortypes(void) WM_operatortype_append(UI_OT_eyedropper_id); WM_operatortype_append(UI_OT_eyedropper_depth); } + +/** + * \brief User Interface Keymap + * + * For now only modal maps here, since UI uses special ui-handlers instead of operators. + */ +void ED_keymap_ui(wmKeyConfig *keyconf) +{ + WM_keymap_find(keyconf, "User Interface", 0, 0); +} diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c index 590bf5d702e..4cb6c9d8fa1 100644 --- a/source/blender/editors/space_api/spacetypes.c +++ b/source/blender/editors/space_api/spacetypes.c @@ -188,6 +188,7 @@ void ED_spacetypes_keymap(wmKeyConfig *keyconf) ED_keymap_marker(keyconf); ED_keymap_view2d(keyconf); + ED_keymap_ui(keyconf); spacetypes = BKE_spacetypes_list(); for (stype = spacetypes->first; stype; stype = stype->next) { |