From 6fee105943c8b1fc87a02441df180b9e34b9540f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 4 Jun 2018 19:09:52 +0200 Subject: Cleanup: correct menu name --- source/blender/makesrna/intern/rna_ui.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'source/blender/makesrna/intern/rna_ui.c') diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c index f2527a8a5e9..f0b6f8d5423 100644 --- a/source/blender/makesrna/intern/rna_ui.c +++ b/source/blender/makesrna/intern/rna_ui.c @@ -275,8 +275,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 */ @@ -668,7 +668,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; @@ -676,12 +676,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); } @@ -783,8 +783,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) -- cgit v1.2.3