[Bf-blender-cvs] [7b0c327] master: Disable key accelerators for splash screen

Campbell Barton noreply at git.blender.org
Tue Jun 9 15:35:51 CEST 2015


Commit: 7b0c327b943d4c4a3b212844ea2d4dfcc77f0556
Author: Campbell Barton
Date:   Tue Jun 9 23:32:02 2015 +1000
Branches: master
https://developer.blender.org/rB7b0c327b943d4c4a3b212844ea2d4dfcc77f0556

Disable key accelerators for splash screen

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

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