[Bf-blender-cvs] [3efc0ac] master: Revert "Revert "Disable key accelerators for splash screen""
Campbell Barton
noreply at git.blender.org
Mon Jun 15 03:04:59 CEST 2015
Commit: 3efc0aca5428bc7eefa1b804f5ee850df88f5cc8
Author: Campbell Barton
Date: Mon Jun 15 10:59:49 2015 +1000
Branches: master
https://developer.blender.org/rB3efc0aca5428bc7eefa1b804f5ee850df88f5cc8
Revert "Revert "Disable key accelerators for splash screen""
This reverts commit 7f3dcbe17feccb99abbdbc3aea83189696d97391.
Please check with authors first, this bug was already fixed since RC1.
===================================================================
M source/blender/editors/interface/interface_regions.c
===================================================================
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index da2852c..8a6df2c 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -1683,13 +1683,8 @@ uiBlock *ui_popup_block_refresh(
ar->regiondata = handle;
/* set UI_BLOCK_NUMSELECT before UI_block_end() so we get alphanumeric keys assigned */
- if (but) {
- if (but->type == UI_BTYPE_PULLDOWN) {
- block->flag |= UI_BLOCK_NUMSELECT;
- }
- }
- else {
- block->flag |= UI_BLOCK_POPUP | UI_BLOCK_NUMSELECT;
+ if (but == NULL) {
+ block->flag |= UI_BLOCK_POPUP;
}
block->flag |= UI_BLOCK_LOOP;
More information about the Bf-blender-cvs
mailing list