[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50537] trunk/blender/source/blender/ editors/interface: a-z menu input now works for enum popups.

[Campbell Barton]

Revision: 50537
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50537
Author:   campbellbarton
Date:     2012-09-11 22:55:27 +0000 (Tue, 11 Sep 2012)
Log Message:
-----------
a-z menu input now works for enum popups.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface.c
    trunk/blender/source/blender/editors/interface/interface_handlers.c

Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c	2012-09-11 22:55:14 UTC (rev 50536)
+++ trunk/blender/source/blender/editors/interface/interface.c	2012-09-11 22:55:27 UTC (rev 50537)
@@ -759,7 +759,7 @@
 		 * fun first pass on all buttons so first word chars always get first priority */
 
 		for (but = block->buttons.first; but; but = but->next) {
-			if (!ELEM4(but->type, BUT, MENU, BLOCK, PULLDOWN) || (but->flag & UI_HIDDEN)) {
+			if (!ELEM5(but->type, BUT, BUTM, MENU, BLOCK, PULLDOWN) || (but->flag & UI_HIDDEN)) {
 				/* pass */
 			}
 			else if (but->menu_key == '\0') {

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2012-09-11 22:55:14 UTC (rev 50536)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2012-09-11 22:55:27 UTC (rev 50537)
@@ -6414,7 +6414,7 @@
 						for (but = block->buttons.first; but; but = but->next) {
 
 							if (but->menu_key == event->type) {
-								if (but->type == BUT) {
+								if (ELEM(but->type, BUT, BUTM)) {
 									/* mainly for operator buttons */
 									ui_handle_button_activate(C, ar, but, BUTTON_ACTIVATE_APPLY);
 								}