03806d0b67
This commit implements described in the #104573. The goal is to fix the confusion of the submodule hashes change, which are not ideal for any of the supported git-module configuration (they are either always visible causing confusion, or silently staged and committed, also causing confusion). This commit replaces submodules with a checkout of addons and addons_contrib, covered by the .gitignore, and locale and developer tools are moved to the main repository. This also changes the paths: - /release/scripts are moved to the /scripts - /source/tools are moved to the /tools - /release/datafiles/locale is moved to /locale This is done to avoid conflicts when using bisect, and also allow buildbot to automatically "recover" wgen building older or newer branches/patches. Running `make update` will initialize the local checkout to the changed repository configuration. Another aspect of the change is that the make update will support Github style of remote organization (origin remote pointing to thy fork, upstream remote pointing to the upstream blender/blender.git). Pull Request #104755
49 lines
1.8 KiB
Python
49 lines
1.8 KiB
Python
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
|
|
def keyconfig_data_oskey_from_ctrl(keyconfig_data_src, *, filter_fn=None):
|
|
keyconfig_data_dst = []
|
|
for km_name, km_parms, km_items_data_src in keyconfig_data_src:
|
|
km_items_data_dst = km_items_data_src.copy()
|
|
items_dst = []
|
|
km_items_data_dst["items"] = items_dst
|
|
for item_src in km_items_data_src["items"]:
|
|
item_op, item_event, item_prop = item_src
|
|
if "ctrl" in item_event:
|
|
if filter_fn is None or filter_fn(item_event):
|
|
item_event = item_event.copy()
|
|
item_event["oskey"] = item_event["ctrl"]
|
|
del item_event["ctrl"]
|
|
items_dst.append((item_op, item_event, item_prop))
|
|
items_dst.append(item_src)
|
|
keyconfig_data_dst.append((km_name, km_parms, km_items_data_dst))
|
|
return keyconfig_data_dst
|
|
|
|
|
|
def keyconfig_data_oskey_from_ctrl_for_macos(keyconfig_data_src):
|
|
"""Use for apple since Cmd is typically used in-place of Ctrl."""
|
|
def filter_fn(item_event):
|
|
if item_event.get("ctrl"):
|
|
event_type = item_event["type"]
|
|
# Ctrl-{Key}
|
|
if (event_type in {
|
|
'H',
|
|
'M',
|
|
'SPACE',
|
|
'W',
|
|
'ACCENT_GRAVE',
|
|
'PERIOD',
|
|
'TAB',
|
|
}):
|
|
if (not item_event.get("alt")) and (not item_event.get("shift")):
|
|
return False
|
|
# Ctrl-Alt-{Key}
|
|
if (event_type in {
|
|
'Q',
|
|
}):
|
|
if item_event.get("alt") and (not item_event.get("shift")):
|
|
return False
|
|
return True
|
|
|
|
return keyconfig_data_oskey_from_ctrl(keyconfig_data_src, filter_fn=filter_fn)
|