From bec08621d60771c2464d9ee20d679c7d202bd9e1 Mon Sep 17 00:00:00 2001
From: Johannes Jakob <johjakob>
Date: Thu, 4 Feb 2021 14:27:44 +0100
Subject: Fix T85363: Cmd + Tab shortcut overridden on macOS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 release/datafiles/locale                                    | 2 +-
 release/scripts/addons                                      | 2 +-
 release/scripts/modules/bl_keymap_utils/platform_helpers.py | 1 +
 source/tools                                                | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 877a343fed9..6c693b5b0b2 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 877a343fed9613d8e02e7fe7181d3bbb628506f2
+Subproject commit 6c693b5b0b27468d4fd2d2c47ea023eebbb0dbc0
diff --git a/release/scripts/addons b/release/scripts/addons
index a3fa40ec0ba..dfeb905d62a 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit a3fa40ec0ba525bc96cbfad49f854a0230b0524e
+Subproject commit dfeb905d62ae6d759d8da930f291e73505e6ca67
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
index d7d7e9d41f7..dd131bc4f95 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit d7d7e9d41f7499aa4639f96c843156ff834385ba
+Subproject commit dd131bc4f95103efa60ce11cafbf174efd7b3d4e
-- 
cgit v1.2.3