[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60555] trunk/blender/source/blender/ editors/interface/interface_handlers.c: pressing enter over a file-text button is ignored ( so enter in the file selector works again).

[Campbell Barton]

Revision: 60555
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60555
Author:   campbellbarton
Date:     2013-10-04 18:34:28 +0000 (Fri, 04 Oct 2013)
Log Message:
-----------
pressing enter over a file-text button is ignored (so enter in the file 
selector works again).

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

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 
2013-10-04 18:04:29 UTC (rev 60554)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 
2013-10-04 18:34:28 UTC (rev 60555)
@@ -2621,7 +2621,10 @@
 {
        if (data->state == BUTTON_STATE_HIGHLIGHT) {
                if (ELEM4(event->type, LEFTMOUSE, EVT_BUT_OPEN, PADENTER, 
RETKEY) && event->val == KM_PRESS) {
-                       if (but->dt == UI_EMBOSSN && !event->ctrl) {
+                       if (ELEM(event->type, PADENTER, RETKEY) && 
(!ui_is_but_utf8(but))) {
+                               /* pass - allow filesel, enter to execute */
+                       }
+                       else if (but->dt == UI_EMBOSSN && !event->ctrl) {
                                /* pass */
                        }
                        else {

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs