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-09-03 06:47:14 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-09-03 06:56:33 +0300
commit660477f4a4f83faf7ec1600bd55134e7ec08f442 (patch)
treeb792a1096167039afc7b5c48957c723d5dac0696
parentd015c1db3e17fedcc4e2eb6a81a045db0f3fde41 (diff)
UI: disable key shortcuts for tools
Only show shortcuts in the tooltips since they use different logic.
-rw-r--r--source/blender/editors/interface/interface.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index 546b646deb5..30827fec391 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -1234,6 +1234,10 @@ static void ui_menu_block_set_keymaps(const bContext *C, uiBlock *block)
if (but->drawstr[0] == '\0') {
continue;
}
+ else if (((block->flag & UI_BLOCK_POPOVER) == 0) && UI_but_is_tool(but)) {
+ /* For non-popovers, shown in shortcut only (has special shortcut handling code). */
+ continue;
+ }
}
else if (but->dt != UI_EMBOSS_PULLDOWN) {
continue;