diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-23 09:11:53 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-23 09:12:55 +0300 |
| commit | 51279107491472a37d3abfb8b21b8bbc24e185e3 (patch) | |
| tree | 41e900a2a69cd0e814ace4cbcf84f774e05784fe /source/blender/editors/interface/interface_region_menu_popup.c | |
| parent | 171c756f2006cf0e839fc9fcdd6b0cadebfe699a (diff) | |
| parent | 6618852b7f11fe097dfe817d6af09e4d535e000e (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 | 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 a0aecb12b84..d4fe0f5a5ee 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); |