[Bf-blender-cvs] [81ed1d7093d] blender2.8: UI: don't show shortcuts in toolbar buttons

Campbell Barton noreply at git.blender.org
Mon Nov 12 04:06:01 CET 2018


Commit: 81ed1d7093dd615b92ea6ef703757205de237ee4
Author: Campbell Barton
Date:   Mon Nov 12 14:04:57 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB81ed1d7093dd615b92ea6ef703757205de237ee4

UI: don't show shortcuts in toolbar buttons

Restrict these to displaying in tooltips.

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

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

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

diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index 41df694176a..e608058dd99 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -4303,10 +4303,6 @@ uiLayout *UI_block_layout(uiBlock *block, int dir, int type, int x, int y, int s
 	if (type == UI_LAYOUT_MENU || type == UI_LAYOUT_PIEMENU)
 		layout->space = 0;
 
-	if (type == UI_LAYOUT_TOOLBAR) {
-		block->flag |= UI_BLOCK_SHOW_SHORTCUT_ALWAYS;
-	}
-
 	if (dir == UI_LAYOUT_HORIZONTAL) {
 		layout->h = size;
 		layout->root->emh = em * UI_UNIT_Y;



More information about the Bf-blender-cvs mailing list