Commit: bdc1108e8cd8bf51e95de72d10862b4466dac8ca
Author: Campbell Barton
Date: Sat Jun 30 12:31:53 2018 +0200
Branches: master
https://developer.blender.org/rBbdc1108e8cd8bf51e95de72d10862b4466dac8ca
Cleanup: remove unused context arg to menu
===================================================================
M source/blender/editors/include/UI_interface.h
M source/blender/editors/interface/interface_layout.c
M source/blender/editors/interface/interface_templates.c
M source/blender/makesrna/intern/rna_ui_api.c
M source/blender/windowmanager/intern/wm_operators.c
M source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
diff --git a/source/blender/editors/include/UI_interface.h
b/source/blender/editors/include/UI_interface.h
index c87334f4bac..f4f7945a8eb 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -1045,7 +1045,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 */
diff --git a/source/blender/editors/interface/interface_layout.c
b/source/blender/editors/interface/interface_layout.c
index 35bd4da4d39..1ff458e743f 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -1922,7 +1922,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 21ed97eed36..4838bdf524e 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -3526,7 +3526,7 @@ void uiTemplateOperatorPropertyButs(
uiLayoutGetBlock(layout)->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/makesrna/intern/rna_ui_api.c
b/source/blender/makesrna/intern/rna_ui_api.c
index bf5ffa20986..328c6dd3eea 100644
--- a/source/blender/makesrna/intern/rna_ui_api.c
+++ b/source/blender/makesrna/intern/rna_ui_api.c
@@ -262,7 +262,7 @@ static void rna_uiItemL(
}
static void rna_uiItemM(
- uiLayout *layout, bContext *C, const char *menuname, const char *name,
const char *text_ctxt,
+ uiLayout *layout, const char *menuname, const char *name, const char
*text_ctxt,
int translate, int icon, int icon_value)
{
/* Get translated name (label). */
@@ -272,7 +272,7 @@ static void rna_uiItemM(
icon = icon_value;
}
- uiItemM(layout, C, menuname, name, icon);
+ uiItemM(layout, menuname, name, icon);
}
static void rna_uiTemplateAnyID(
@@ -673,7 +673,6 @@ void RNA_api_ui_layout(StructRNA *srna)
RNA_def_property_ui_text(parm, "Icon Value", "Override automatic icon
of the item");
func = RNA_def_function(srna, "menu", "rna_uiItemM");
- RNA_def_function_flag(func, FUNC_USE_CONTEXT);
parm = RNA_def_string(func, "menu", NULL, 0, "", "Identifier of the
menu");
api_ui_item_common(func);
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
diff --git a/source/blender/windowmanager/intern/wm_operators.c
b/source/blender/windowmanager/intern/wm_operators.c
index 208a9e1ee06..7eeb2ce762e 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1899,8 +1899,7 @@ static uiBlock *wm_block_create_splash(bContext *C,
ARegion *ar, void *UNUSED(ar
if (mt) {
UI_menutype_draw(C, mt, layout);
-// wmWindowManager *wm = CTX_wm_manager(C);
-// uiItemM(layout, C, "USERPREF_MT_keyconfigs", U.keyconfigstr,
ICON_NONE);
+// uiItemM(layout, "USERPREF_MT_keyconfigs", U.keyconfigstr,
ICON_NONE);
}
UI_block_emboss_set(block, UI_EMBOSS_PULLDOWN);
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c
b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 8e41a08e93d..fc501003a3e 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -591,7 +591,7 @@ void uiItemIntO(uiLayout *layout, const char *name, int
icon, const char *opname
void uiItemFloatO(uiLayout *layout, const char *name, int icon, const char
*opname, const char *propname, float value) RET_NONE
void uiItemStringO(uiLayout *layout, const char *name, int icon, const char
*opname, const char *propname, const char *value) RET_NONE
void uiItemL(struct uiLayout *layout, const char *name, int icon) RET_NONE
-void uiItemM(uiLayout *layout, struct bContext *C, const char *menuname, const
char *name, int icon) RET_NONE
+void uiItemM(uiLayout *layout, const char *menuname, const char *name, int
icon) RET_NONE
void uiItemS(struct uiLayout *layout) RET_NONE
void uiItemFullR(uiLayout *layout, struct PointerRNA *ptr, struct PropertyRNA
*prop, int index, int value, int flag, const char *name, int icon) RET_NONE
void uiLayoutSetContextPointer(uiLayout *layout, const char *name, struct
PointerRNA *ptr) RET_NONE
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
