diff options
author | Julian Eisel <julian@blender.org> | 2020-03-06 18:56:42 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-03-06 19:19:23 +0300 |
commit | b2ee1770d4c31078518f4ec9edd5196a41345162 (patch) | |
tree | 6b7f6ff9057322245fc3b3407bece3f1c0cb3eb5 /source/blender/editors/space_script | |
parent | b825a95ec311a169d33fe21e28418f11a516c82f (diff) |
Cleanup: Rename ARegion variables from ar to region
The old convention was easy to confuse with ScrArea.
Part of https://developer.blender.org/T74432.
This is mostly a batch rename with some manual fixing. Only single word
variable names are changed, no prefixed/suffixed names.
Brecht van Lommel and Campbell Barton both gave me a green light for
this convention change.
Also ran clan clang format on affected files.
Diffstat (limited to 'source/blender/editors/space_script')
-rw-r--r-- | source/blender/editors/space_script/script_edit.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_script/space_script.c | 36 |
2 files changed, 20 insertions, 20 deletions
diff --git a/source/blender/editors/space_script/script_edit.c b/source/blender/editors/space_script/script_edit.c index 2be05785d2b..b9e97a19b82 100644 --- a/source/blender/editors/space_script/script_edit.c +++ b/source/blender/editors/space_script/script_edit.c @@ -51,8 +51,8 @@ static int run_pyfile_exec(bContext *C, wmOperator *op) RNA_string_get(op->ptr, "filepath", path); #ifdef WITH_PYTHON if (BPY_execute_filepath(C, path, op->reports)) { - ARegion *ar = CTX_wm_region(C); - ED_region_tag_redraw(ar); + ARegion *region = CTX_wm_region(C); + ED_region_tag_redraw(region); return OPERATOR_FINISHED; } #else diff --git a/source/blender/editors/space_script/space_script.c b/source/blender/editors/space_script/space_script.c index b99c2eaf54e..4ee3a87e4fa 100644 --- a/source/blender/editors/space_script/space_script.c +++ b/source/blender/editors/space_script/space_script.c @@ -53,24 +53,24 @@ static SpaceLink *script_new(const ScrArea *UNUSED(area), const Scene *UNUSED(scene)) { - ARegion *ar; + ARegion *region; SpaceScript *sscript; sscript = MEM_callocN(sizeof(SpaceScript), "initscript"); sscript->spacetype = SPACE_SCRIPT; /* header */ - ar = MEM_callocN(sizeof(ARegion), "header for script"); + region = MEM_callocN(sizeof(ARegion), "header for script"); - BLI_addtail(&sscript->regionbase, ar); - ar->regiontype = RGN_TYPE_HEADER; - ar->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM : RGN_ALIGN_TOP; + BLI_addtail(&sscript->regionbase, region); + region->regiontype = RGN_TYPE_HEADER; + region->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM : RGN_ALIGN_TOP; /* main region */ - ar = MEM_callocN(sizeof(ARegion), "main region for script"); + region = MEM_callocN(sizeof(ARegion), "main region for script"); - BLI_addtail(&sscript->regionbase, ar); - ar->regiontype = RGN_TYPE_WINDOW; + BLI_addtail(&sscript->regionbase, region); + region->regiontype = RGN_TYPE_WINDOW; /* channel list region XXX */ @@ -108,22 +108,22 @@ static SpaceLink *script_duplicate(SpaceLink *sl) } /* add handlers, stuff you only do once or on area/region changes */ -static void script_main_region_init(wmWindowManager *wm, ARegion *ar) +static void script_main_region_init(wmWindowManager *wm, ARegion *region) { wmKeyMap *keymap; - UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_STANDARD, ar->winx, ar->winy); + UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_STANDARD, region->winx, region->winy); /* own keymap */ keymap = WM_keymap_ensure(wm->defaultconf, "Script", SPACE_SCRIPT, 0); - WM_event_add_keymap_handler_v2d_mask(&ar->handlers, keymap); + WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); } -static void script_main_region_draw(const bContext *C, ARegion *ar) +static void script_main_region_draw(const bContext *C, ARegion *region) { /* draw entirely, view changes should be handled here */ SpaceScript *sscript = (SpaceScript *)CTX_wm_space_data(C); - View2D *v2d = &ar->v2d; + View2D *v2d = ®ion->v2d; /* clear and setup matrix */ UI_ThemeClearColor(TH_BACK); @@ -149,19 +149,19 @@ static void script_main_region_draw(const bContext *C, ARegion *ar) } /* add handlers, stuff you only do once or on area/region changes */ -static void script_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar) +static void script_header_region_init(wmWindowManager *UNUSED(wm), ARegion *region) { - ED_region_header_init(ar); + ED_region_header_init(region); } -static void script_header_region_draw(const bContext *C, ARegion *ar) +static void script_header_region_draw(const bContext *C, ARegion *region) { - ED_region_header(C, ar); + ED_region_header(C, region); } static void script_main_region_listener(wmWindow *UNUSED(win), ScrArea *UNUSED(sa), - ARegion *UNUSED(ar), + ARegion *UNUSED(region), wmNotifier *UNUSED(wmn), const Scene *UNUSED(scene)) { |