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:
authorJohannes Jakob <johjakob>2021-02-04 16:27:44 +0300
committerBrecht Van Lommel <brecht@blender.org>2021-02-04 16:27:44 +0300
commitbec08621d60771c2464d9ee20d679c7d202bd9e1 (patch)
tree31f5696ecfac8571b103b6a99202c48f992c3f93
parent3f90c11621845424a0b61d293f71ab179e88f56b (diff)
Fix T85363: Cmd + Tab shortcut overridden on macOS
Adds an exception so that the key-binding `control + Tab` does not get duplicated as `command + Tab` on macOS because this is a global system shortcut for the app switcher. The key-binding `command + Tab` was shown for the operators “Toggle Graph Editor“ and “Toggle Dope Sheet” in Dope Sheet and Graph Editor, but only `control + Tab` actually worked. Differential Revision: https://developer.blender.org/D10304
m---------release/datafiles/locale0
m---------release/scripts/addons0
-rw-r--r--release/scripts/modules/bl_keymap_utils/platform_helpers.py1
m---------source/tools0
4 files changed, 1 insertions, 0 deletions
diff --git a/release/datafiles/locale b/release/datafiles/locale
-Subproject 877a343fed9613d8e02e7fe7181d3bbb628506f
+Subproject 6c693b5b0b27468d4fd2d2c47ea023eebbb0dbc
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject a3fa40ec0ba525bc96cbfad49f854a0230b0524
+Subproject dfeb905d62ae6d759d8da930f291e73505e6ca6
diff --git a/release/scripts/modules/bl_keymap_utils/platform_helpers.py b/release/scripts/modules/bl_keymap_utils/platform_helpers.py
index e18a902c562..a6058b993d5 100644
--- a/release/scripts/modules/bl_keymap_utils/platform_helpers.py
+++ b/release/scripts/modules/bl_keymap_utils/platform_helpers.py
@@ -49,6 +49,7 @@ def keyconfig_data_oskey_from_ctrl_for_macos(keyconfig_data_src):
'W',
'ACCENT_GRAVE',
'PERIOD',
+ 'TAB',
}):
if (not item_event.get("alt")) and (not item_event.get("shift")):
return False
diff --git a/source/tools b/source/tools
-Subproject d7d7e9d41f7499aa4639f96c843156ff834385b
+Subproject dd131bc4f95103efa60ce11cafbf174efd7b3d4