Commit: 97c66c9bf14090a0c45252bd68dcef9bf28661a5
Author: Brecht Van Lommel
Date: Mon Feb 24 19:47:48 2014 +0100
https://developer.blender.org/rB97c66c9bf14090a0c45252bd68dcef9bf28661a5
Fix T38812: color picker incorrectly cancelling operation when clicking next to
it.
===================================================================
M source/blender/editors/interface/interface_handlers.c
===================================================================
diff --git a/source/blender/editors/interface/interface_handlers.c
b/source/blender/editors/interface/interface_handlers.c
index 05b31c0..1144ebc 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))
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
