diff options
| author | Thomas Beck <software@plasmasolutions.de> | 2015-06-15 01:43:59 +0300 |
|---|---|---|
| committer | Thomas Beck <software@plasmasolutions.de> | 2015-06-15 01:54:28 +0300 |
| commit | 7f3dcbe17feccb99abbdbc3aea83189696d97391 (patch) | |
| tree | 1d2ba33b71394ec5ba3b06e7281e30302e93a81d /source/blender/editors/interface/interface_regions.c | |
| parent | e464cbae3bc36b7b30dec1cbd7f7c830b32f4aaa (diff) | |
Revert "Disable key accelerators for splash screen"
This reverts commit 7b0c327b943d4c4a3b212844ea2d4dfcc77f0556.
The problem with this commit is that the "move to layer" functionality by hitting M,1 f.e. didn't work anymore...
Campbell, would be great if you could look into this again, as I'm not experienced in this specific region..
Diffstat (limited to 'source/blender/editors/interface/interface_regions.c')
| -rw-r--r-- | source/blender/editors/interface/interface_regions.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 8a6df2c1873..da2852c71d1 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -1683,8 +1683,13 @@ uiBlock *ui_popup_block_refresh( ar->regiondata = handle; /* set UI_BLOCK_NUMSELECT before UI_block_end() so we get alphanumeric keys assigned */ - if (but == NULL) { - block->flag |= UI_BLOCK_POPUP; + if (but) { + if (but->type == UI_BTYPE_PULLDOWN) { + block->flag |= UI_BLOCK_NUMSELECT; + } + } + else { + block->flag |= UI_BLOCK_POPUP | UI_BLOCK_NUMSELECT; } block->flag |= UI_BLOCK_LOOP; |