diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-12 04:22:05 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-12 04:22:05 +0300 |
| commit | 8d2ca0b8ef8f5c2b22e24965f6982f826014840b (patch) | |
| tree | 7ab6e64ce53a24371afeffe5caad9106ba921a3b /source/blender | |
| parent | 89786d4e304cb58a134abcadd6502266ec7742d0 (diff) | |
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.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/interface/interface_region_tooltip.c | 2 |
1 files changed, 1 insertions, 1 deletions
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). |