diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-01-30 12:18:59 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-01-30 12:18:59 +0300 |
| commit | 36b5cd008d8534c6b5db7b08f57884270871cf05 (patch) | |
| tree | 22cf2d329fbc8f59b500ad896966243600d74edc /source/blender/editors/interface/interface_handlers.c | |
| parent | 4279e6d1fd20c51a83bc419833434dee1d1d2101 (diff) | |
Fix #19904: selecting a new image color closes the popup.
Diffstat (limited to 'source/blender/editors/interface/interface_handlers.c')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 351b72c16a1..019aa10e902 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -5254,7 +5254,7 @@ int ui_handle_menu_event(bContext *C, wmEvent *event, uiPopupBlockHandle *menu, /* if we are didn't handle the event yet, lets pass it on to * buttons inside this region. disabled inside check .. not sure - * anymore why it was there? but i meant enter enter didn't work + * anymore why it was there? but it meant enter didn't work * for example when mouse was not over submenu */ if((/*inside &&*/ (!menu->menuretval || menu->menuretval == UI_RETURN_UPDATE) && retval == WM_UI_HANDLER_CONTINUE) || event->type == TIMER) { but= ui_but_find_activated(ar); @@ -5313,8 +5313,6 @@ static int ui_handle_menu_return_submenu(bContext *C, wmEvent *event, uiPopupBlo } update= (submenu->menuretval == UI_RETURN_UPDATE); - if(update) - menu->menuretval = UI_RETURN_UPDATE; /* now let activated button in this menu exit, which * will actually close the submenu too */ |