diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-30 14:52:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-30 14:52:04 +0300 |
| commit | eb63b32deea5772a5947cb6b77d2a89b1d22e6d1 (patch) | |
| tree | 81f6754a8424058d4d97713d2e674dd3a403700f /source/blender/editors | |
| parent | 41176cd3d820649488ec5a5475d5dc7e97a01a59 (diff) | |
| parent | bdc1108e8cd8bf51e95de72d10862b4466dac8ca (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors')
4 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index b30ae67a3bd..dcfb1ac3219 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -1140,7 +1140,7 @@ void uiItemsFullEnumO_items( void uiItemL(uiLayout *layout, const char *name, int icon); /* label */ void uiItemLDrag(uiLayout *layout, struct PointerRNA *ptr, const char *name, int icon); /* label icon for dragging */ -void uiItemM(uiLayout *layout, struct bContext *C, const char *menuname, const char *name, int icon); /* menu */ +void uiItemM(uiLayout *layout, const char *menuname, const char *name, int icon); /* menu */ void uiItemV(uiLayout *layout, const char *name, int icon, int argval); /* value */ void uiItemS(uiLayout *layout); /* separator */ void uiItemSpacer(uiLayout *layout); /* Special separator. */ diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 0a794a18b20..63f51b991ae 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -2113,7 +2113,7 @@ static uiBut *ui_item_menu( return but; } -void uiItemM(uiLayout *layout, bContext *UNUSED(C), const char *menuname, const char *name, int icon) +void uiItemM(uiLayout *layout, const char *menuname, const char *name, int icon) { MenuType *mt; diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 9f5e0b9f26e..de5ba65b4a7 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -3944,7 +3944,7 @@ eAutoPropButsReturn uiTemplateOperatorPropertyButs( block->ui_operator = op; row = uiLayoutRow(layout, true); - uiItemM(row, (bContext *)C, "WM_MT_operator_presets", NULL, ICON_NONE); + uiItemM(row, "WM_MT_operator_presets", NULL, ICON_NONE); wmOperatorType *ot = WM_operatortype_find("WM_OT_operator_preset_add", false); uiItemFullO_ptr(row, ot, "", ICON_ZOOMIN, NULL, WM_OP_INVOKE_DEFAULT, 0, &op_ptr); diff --git a/source/blender/editors/screen/screen_user_menu.c b/source/blender/editors/screen/screen_user_menu.c index f36bceaa129..382f6cac474 100644 --- a/source/blender/editors/screen/screen_user_menu.c +++ b/source/blender/editors/screen/screen_user_menu.c @@ -172,8 +172,7 @@ static void screen_user_menu_draw(const bContext *C, Menu *menu) } else if (umi->type == USER_MENU_TYPE_MENU) { bUserMenuItem_Menu *umi_mt = (bUserMenuItem_Menu *)umi; - uiItemM( - menu->layout, NULL, umi_mt->mt_idname, umi->ui_name[0] ? umi->ui_name : NULL, + uiItemM(menu->layout, umi_mt->mt_idname, umi->ui_name[0] ? umi->ui_name : NULL, ICON_NONE); } else if (umi->type == USER_MENU_TYPE_SEP) { |