diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-05 17:35:20 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-05 17:36:13 +0300 |
| commit | 7436fb2ef1d8bb0af0589f8ec4b45c8800aed983 (patch) | |
| tree | e99050b05bf97b20cc0f5c05ea549aa31d8fba09 /source/blender/makesrna/intern/rna_ui.c | |
| parent | d94df18550702a9df7b56feb5d58fb20effb7536 (diff) | |
| parent | c68429bc038635a6c2a3f29a5b057c077be3a4b0 (diff) | |
Merge branch 'master' into 28
Diffstat (limited to 'source/blender/makesrna/intern/rna_ui.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_ui.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c index 354fa43367e..ce1f9efcf63 100644 --- a/source/blender/makesrna/intern/rna_ui.c +++ b/source/blender/makesrna/intern/rna_ui.c @@ -302,8 +302,8 @@ static StructRNA *rna_Panel_register( static StructRNA *rna_Panel_refine(PointerRNA *ptr) { - Panel *hdr = (Panel *)ptr->data; - return (hdr->type && hdr->type->ext.srna) ? hdr->type->ext.srna : &RNA_Panel; + Panel *menu = (Panel *)ptr->data; + return (menu->type && menu->type->ext.srna) ? menu->type->ext.srna : &RNA_Panel; } /* UIList */ @@ -696,7 +696,7 @@ static int menu_poll(const bContext *C, MenuType *pt) return visible; } -static void menu_draw(const bContext *C, Menu *hdr) +static void menu_draw(const bContext *C, Menu *menu) { extern FunctionRNA rna_Menu_draw_func; @@ -704,12 +704,12 @@ static void menu_draw(const bContext *C, Menu *hdr) ParameterList list; FunctionRNA *func; - RNA_pointer_create(&CTX_wm_screen(C)->id, hdr->type->ext.srna, hdr, &mtr); + RNA_pointer_create(&CTX_wm_screen(C)->id, menu->type->ext.srna, menu, &mtr); func = &rna_Menu_draw_func; /* RNA_struct_find_function(&mtr, "draw"); */ RNA_parameter_list_create(&list, &mtr, func); RNA_parameter_set_lookup(&list, "context", &C); - hdr->type->ext.call((bContext *)C, &mtr, func, &list); + menu->type->ext.call((bContext *)C, &mtr, func, &list); RNA_parameter_list_free(&list); } @@ -818,8 +818,8 @@ static StructRNA *rna_Menu_register( static StructRNA *rna_Menu_refine(PointerRNA *mtr) { - Menu *hdr = (Menu *)mtr->data; - return (hdr->type && hdr->type->ext.srna) ? hdr->type->ext.srna : &RNA_Menu; + Menu *menu = (Menu *)mtr->data; + return (menu->type && menu->type->ext.srna) ? menu->type->ext.srna : &RNA_Menu; } static void rna_Menu_bl_description_set(PointerRNA *ptr, const char *value) |