Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-06-15 03:59:49 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-06-15 03:59:53 +0300
commit3efc0aca5428bc7eefa1b804f5ee850df88f5cc8 (patch)
tree9b6e770495b567663081cbbb0c8ca846829602fd /source/blender/editors/interface/interface_regions.c
parent7f3dcbe17feccb99abbdbc3aea83189696d97391 (diff)
Revert "Revert "Disable key accelerators for splash screen""
This reverts commit 7f3dcbe17feccb99abbdbc3aea83189696d97391. Please check with authors first, this bug was already fixed since RC1.
Diffstat (limited to 'source/blender/editors/interface/interface_regions.c')
-rw-r--r--source/blender/editors/interface/interface_regions.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index da2852c71d1..8a6df2c1873 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;