diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-22 11:51:23 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-22 11:51:23 +0300 |
commit | 1de7a0c0dc011a9286f14552858f10efc64d5f91 (patch) | |
tree | 1957a7ddac128dd6c1fa88aa900ccbd5752800c8 /source/blender/makesrna/intern/rna_wm_api.c | |
parent | e597f7495abcb5eedf8db27b4c4a72b3a58b727e (diff) | |
parent | 420e379e99a3351b2dd2a46989aa1d50bdf8abef (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_wm_api.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_wm_api.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c index 82077051c18..28d8115f8c6 100644 --- a/source/blender/makesrna/intern/rna_wm_api.c +++ b/source/blender/makesrna/intern/rna_wm_api.c @@ -331,7 +331,7 @@ static void rna_KeyConfig_remove(wmWindowManager *wm, ReportList *reports, Point } /* popup menu wrapper */ -static PointerRNA rna_PupMenuBegin(bContext *C, const char *title, int icon) +static PointerRNA rna_PopMenuBegin(bContext *C, const char *title, int icon) { PointerRNA r_ptr; void *data; @@ -343,7 +343,7 @@ static PointerRNA rna_PupMenuBegin(bContext *C, const char *title, int icon) return r_ptr; } -static void rna_PupMenuEnd(bContext *C, PointerRNA *handle) +static void rna_PopMenuEnd(bContext *C, PointerRNA *handle) { UI_popup_menu_end(C, handle->data); } @@ -524,7 +524,7 @@ void RNA_api_wm(StructRNA *srna) /* wrap UI_popup_menu_begin */ - func = RNA_def_function(srna, "pupmenu_begin__internal", "rna_PupMenuBegin"); + func = RNA_def_function(srna, "popmenu_begin__internal", "rna_PopMenuBegin"); RNA_def_function_flag(func, FUNC_NO_SELF | FUNC_USE_CONTEXT); parm = RNA_def_string(func, "title", NULL, 0, "", ""); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); @@ -536,7 +536,7 @@ void RNA_api_wm(StructRNA *srna) RNA_def_function_return(func, parm); /* wrap UI_popup_menu_end */ - func = RNA_def_function(srna, "pupmenu_end__internal", "rna_PupMenuEnd"); + func = RNA_def_function(srna, "popmenu_end__internal", "rna_PopMenuEnd"); RNA_def_function_flag(func, FUNC_NO_SELF | FUNC_USE_CONTEXT); parm = RNA_def_pointer(func, "menu", "UIPopupMenu", "", ""); RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_RNAPTR); |