diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-23 11:45:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-23 11:46:09 +0300 |
| commit | 43872124f78de03e55b567cf13fc88ff8edbef55 (patch) | |
| tree | f54054deeb11d4f642aa28a2f2a5c0db404f35fc /source/blender/editors/interface/interface_region_menu_popup.c | |
| parent | 0511cded25257877e5c41e27b5d01c29d37efac5 (diff) | |
| parent | f8a3636374b76f6db31be21beaa0e40857644bc4 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface/interface_region_menu_popup.c')
| -rw-r--r-- | source/blender/editors/interface/interface_region_menu_popup.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/source/blender/editors/interface/interface_region_menu_popup.c b/source/blender/editors/interface/interface_region_menu_popup.c index a6046e551c6..b9222a75803 100644 --- a/source/blender/editors/interface/interface_region_menu_popup.c +++ b/source/blender/editors/interface/interface_region_menu_popup.c @@ -458,6 +458,21 @@ void UI_popup_menu_end(bContext *C, uiPopupMenu *pup) MEM_freeN(pup); } +bool UI_popup_menu_end_or_cancel(bContext *C, uiPopupMenu *pup) +{ + if (!UI_block_is_empty(pup->block)) { + UI_popup_menu_end(C, pup); + return true; + } + else { + UI_block_layout_resolve(pup->block, NULL, NULL); + MEM_freeN(pup->block->handle); + UI_block_free(C, pup->block); + MEM_freeN(pup); + return false; + } +} + uiLayout *UI_popup_menu_layout(uiPopupMenu *pup) { return pup->layout; |