[Bf-blender-cvs] [8d2ca0b8ef8] blender2.8: Fix error clearing the popup toolbar keymap

[Campbell Barton]

Commit: 8d2ca0b8ef8f5c2b22e24965f6982f826014840b
Author: Campbell Barton
Date:   Mon Nov 12 12:22:05 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB8d2ca0b8ef8f5c2b22e24965f6982f826014840b

Fix error clearing the popup toolbar keymap

Generating the keymap for the tooltip stopped shortcuts from running.

While this could be supported - the shortcuts show in the button,
so remove shortcuts from these tips.

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

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

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

diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c
index e1c8b00cfef..8d7d67fb69f 100644
--- a/source/blender/editors/interface/interface_region_tooltip.c
+++ b/source/blender/editors/interface/interface_region_tooltip.c
@@ -449,7 +449,7 @@ static uiTooltipData *ui_tooltip_data_from_tool(bContext *C, uiBut *but, bool is
 	}
 
 	/* Shortcut. */
-	if (is_label == false) {
+	if (is_label == false && ((but->block->flag & UI_BLOCK_SHOW_SHORTCUT_ALWAYS) == 0)) {
 		/* There are different kinds of shortcuts:
 		 *
 		 * - Direct access to the tool (as if the toolbar button is pressed).