diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-24 22:47:48 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-24 22:53:15 +0400 |
| commit | 97c66c9bf14090a0c45252bd68dcef9bf28661a5 (patch) | |
| tree | ddea6b97b3fa7871e03bc809f02578f73dfd428f | |
| parent | 88f1c283a773bb76334d2d6a849d4e45c5c95373 (diff) | |
Fix T38812: color picker incorrectly cancelling operation when clicking next to it.
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 05b31c016f8..1144ebc7fe0 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -8092,7 +8092,10 @@ static int ui_handle_menu_event(bContext *C, const wmEvent *event, uiPopupBlockH { if ((level == 0) && (U.uiflag & USER_MENUOPENAUTO) == 0) { /* for root menus, allow clicking to close */ - menu->menuretval = UI_RETURN_OUT; + if (block->flag & (UI_BLOCK_OUT_1)) + menu->menuretval = UI_RETURN_OK; + else + menu->menuretval = UI_RETURN_OUT; } else if (saferct && !BLI_rctf_isect_pt(&saferct->parent, event->x, event->y)) { if (block->flag & (UI_BLOCK_OUT_1)) |