merge with trunk at r31523
[blender.git] / source / blender / editors / interface / interface_handlers.c
index 8dcc204f06f66b5d8943be3e2df85b05073e23f7..9d99409a741fd1791ad8e427acc751e6ee5e9876 100644 (file)
@@ -4271,9 +4271,9 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, wmEvent *event)
                        /* RMB has two options now */
                        if (ui_but_menu(C, but)) {
                                return WM_UI_HANDLER_BREAK;
-                       }
                }
        }
+       }
 
        /* verify if we can edit this button */
        if(ELEM(event->type, LEFTMOUSE, RETKEY)) {