Cycles: svn merge -r41182:41205 ^/trunk/blender
[blender-staging.git] / source / blender / editors / interface / interface_panel.c
index f4416bc56df8011bee3051c2122e2f8db387222c..17a2de5637139e3036971d8446b0fd2b4042fb26 100644 (file)
@@ -1046,7 +1046,7 @@ int ui_handler_panel_region(bContext *C, wmEvent *event)
                                inside= 1;
                
                if(inside && event->val==KM_PRESS) {
                                inside= 1;
                
                if(inside && event->val==KM_PRESS) {
-                       if(event->type == AKEY && !ELEM4(1, event->ctrl, event->oskey, event->shift, event->alt)) {
+                       if(event->type == AKEY && !ELEM4(KM_MOD_FIRST, event->ctrl, event->oskey, event->shift, event->alt)) {
                                
                                if(pa->flag & PNL_CLOSEDY) {
                                        if((block->maxy <= my) && (block->maxy+PNL_HEADER >= my))
                                
                                if(pa->flag & PNL_CLOSEDY) {
                                        if((block->maxy <= my) && (block->maxy+PNL_HEADER >= my))