From b2ee1770d4c31078518f4ec9edd5196a41345162 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Fri, 6 Mar 2020 16:56:42 +0100 Subject: 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. --- source/blender/editors/render/render_opengl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/editors/render/render_opengl.c') diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index add023fe57a..4fa1903758f 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -105,7 +105,7 @@ typedef struct OGLRender { View3D *v3d; RegionView3D *rv3d; - ARegion *ar; + ARegion *region; ScrArea *prevsa; ARegion *prevar; @@ -287,7 +287,7 @@ static void screen_opengl_render_doit(const bContext *C, OGLRender *oglrender, R { Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); Scene *scene = oglrender->scene; - ARegion *ar = oglrender->ar; + ARegion *region = oglrender->region; View3D *v3d = oglrender->v3d; RegionView3D *rv3d = oglrender->rv3d; Object *camera = NULL; @@ -377,7 +377,7 @@ static void screen_opengl_render_doit(const bContext *C, OGLRender *oglrender, R scene, v3d->shading.type, v3d, - ar, + region, sizex, sizey, imbuf_flags, @@ -806,9 +806,9 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op) if (is_view_context) { /* so quad view renders camera */ - ED_view3d_context_user_region(C, &oglrender->v3d, &oglrender->ar); + ED_view3d_context_user_region(C, &oglrender->v3d, &oglrender->region); - oglrender->rv3d = oglrender->ar->regiondata; + oglrender->rv3d = oglrender->region->regiondata; /* MUST be cleared on exit */ memset(&oglrender->scene->customdata_mask_modal, -- cgit v1.2.3