diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-27 07:35:49 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-27 07:35:49 +0300 |
commit | e26b67fa1e13b45c395878dfc667af0b4cc458cf (patch) | |
tree | b15396238f00290a2581addede36e400d1ea7511 /source/blender/editors/interface | |
parent | 69a77a1b83639189f2bbb54a198907192086eb26 (diff) |
Fix popovers from enums failing on drag-release
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 404de2cd085..d1294dcfed2 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -7969,7 +7969,11 @@ static int ui_handle_button_event(bContext *C, const wmEvent *event, uiBut *but) data->cancel = false; button_activate_state(C, but, BUTTON_STATE_EXIT); retval = WM_UI_HANDLER_BREAK; - block->handle->menuretval = UI_RETURN_OK; + /* Cancel because this `but` handles all events and we don't want + * the parent button's update function to do anything. + * + * Causes issues with buttons defined by #uiItemFullR_with_popover. */ + block->handle->menuretval = UI_RETURN_CANCEL; } else if (ui_but_is_editable_as_text(but)) { ui_handle_button_activate(C, ar, but, BUTTON_ACTIVATE_TEXT_EDITING); |