merge with 2.5 at r18679
[blender.git] / source / blender / editors / interface / interface_handlers.c
index ef4398608d1f6087930ff87ac9bc40788fc90386..bfe6057cfce429114fa865435d491b91d6142a77 100644 (file)
@@ -3340,12 +3340,12 @@ int ui_handle_menu_event(bContext *C, wmEvent *event, uiMenuBlockHandle *menu, i
                                                but= ui_but_find_activated(ar);
                                                if(but) {
                                                        if(ELEM(event->type, DOWNARROWKEY, WHEELDOWNMOUSE)) {
-                                                               if(block->direction & UI_DOWN) but= ui_but_next(but);
-                                                               else but= ui_but_prev(but);
+                                                               if(block->direction & UI_TOP) but= ui_but_prev(but);
+                                                               else but= ui_but_next(but);
                                                        }
                                                        else {
-                                                               if(block->direction & UI_DOWN) but= ui_but_prev(but);
-                                                               else but= ui_but_next(but);
+                                                               if(block->direction & UI_TOP) but= ui_but_next(but);
+                                                               else but= ui_but_prev(but);
                                                        }
 
                                                        if(but)