diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-23 09:01:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-23 09:02:03 +0300 |
| commit | 6618852b7f11fe097dfe817d6af09e4d535e000e (patch) | |
| tree | 7fbb1c647c7e44bcd9d9d161b65949759a5a7cd0 /source/blender/editors/interface/interface_region_menu_popup.c | |
| parent | f36c803e55983ad30b032da2a775752eb4491fdc (diff) | |
WM: Add WM_menutype_poll function
Wraps menutype poll, no functional changes.
Diffstat (limited to 'source/blender/editors/interface/interface_region_menu_popup.c')
| -rw-r--r-- | source/blender/editors/interface/interface_region_menu_popup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_region_menu_popup.c b/source/blender/editors/interface/interface_region_menu_popup.c index aa3e2464237..ae133e909bd 100644 --- a/source/blender/editors/interface/interface_region_menu_popup.c +++ b/source/blender/editors/interface/interface_region_menu_popup.c @@ -518,9 +518,10 @@ int UI_popup_menu_invoke(bContext *C, const char *idname, ReportList *reports) return OPERATOR_CANCELLED; } - if (mt->poll && mt->poll(C, mt) == 0) + if (WM_menutype_poll(C, mt) == false) { /* cancel but allow event to pass through, just like operators do */ return (OPERATOR_CANCELLED | OPERATOR_PASS_THROUGH); + } pup = UI_popup_menu_begin(C, IFACE_(mt->label), ICON_NONE); layout = UI_popup_menu_layout(pup); |