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/makesrna/intern/rna_ui_api.c | |
parent | 41176cd3d820649488ec5a5475d5dc7e97a01a59 (diff) | |
parent | bdc1108e8cd8bf51e95de72d10862b4466dac8ca (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_ui_api.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_ui_api.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c index 943e6c2e31f..f960cff1cd2 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_uiItemPopoverPanel( @@ -709,7 +709,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); |