[Bf-blender-cvs] [660477f4a4f] blender2.8: UI: disable key shortcuts for tools

[Campbell Barton]

Commit: 660477f4a4f83faf7ec1600bd55134e7ec08f442
Author: Campbell Barton
Date:   Mon Sep 3 13:47:14 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB660477f4a4f83faf7ec1600bd55134e7ec08f442

UI: disable key shortcuts for tools

Only show shortcuts in the tooltips since they use different logic.

===================================================================

M	source/blender/editors/interface/interface.c

===================================================================

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;