blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton 2018-02-23 17:11:53 +11:00
parent 171c756f20 6618852b7f
commit 5127910749
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/interface/interface_region_menu_pie.c
View File

@ -214,9 +214,10 @@ int UI_pie_menu_invoke(struct bContext *C, const char *idname, const wmEvent *ev
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);
}
pie = UI_pie_menu_begin(C, IFACE_(mt->label), ICON_NONE, event);
layout = UI_pie_menu_layout(pie);

3
source/blender/editors/interface/interface_region_menu_popup.c
View File

@ -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);

1
source/blender/windowmanager/WM_api.h
View File

@ -416,6 +416,7 @@ struct MenuType *WM_menutype_find(const char *idname, bool quiet);
bool WM_menutype_add(struct MenuType *mt);
void WM_menutype_freelink(struct MenuType *mt);
void WM_menutype_free(void);
bool WM_menutype_poll(struct bContext *C, struct MenuType *mt);
/* wm_gesture_ops.c */
int WM_gesture_border_invoke (struct bContext *C, struct wmOperator *op, const struct wmEvent *event);

8
source/blender/windowmanager/intern/wm.c
View File

@ -339,6 +339,14 @@ void WM_menutype_free(void)
menutypes_hash = NULL;
}
bool WM_menutype_poll(bContext *C, MenuType *mt)
{
if (mt->poll != NULL) {
return mt->poll(C, mt);
}
return true;
}
/* ****************************************** */
void WM_keymap_init(bContext *C)