[Bf-blender-cvs] [7f3dcbe] master: Revert "Disable key accelerators for splash screen"

[Thomas Beck]

Commit: 7f3dcbe17feccb99abbdbc3aea83189696d97391
Author: Thomas Beck
Date:   Mon Jun 15 00:43:59 2015 +0200
Branches: master
https://developer.blender.org/rB7f3dcbe17feccb99abbdbc3aea83189696d97391

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..

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

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 8a6df2c..da2852c 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;