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/render | |
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/render')
-rw-r--r-- | source/blender/editors/render/render_opengl.c | 10 | ||||
-rw-r--r-- | source/blender/editors/render/render_update.c | 20 |
2 files changed, 15 insertions, 15 deletions
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, diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c index 3918737d560..e494bd90d65 100644 --- a/source/blender/editors/render/render_update.c +++ b/source/blender/editors/render/render_update.c @@ -107,7 +107,7 @@ void ED_render_scene_update(const DEGEditorUpdateContext *update_ctx, int update for (win = wm->windows.first; win; win = win->next) { bScreen *sc = WM_window_get_active_screen(win); ScrArea *sa; - ARegion *ar; + ARegion *region; CTX_wm_window_set(C, win); @@ -116,11 +116,11 @@ void ED_render_scene_update(const DEGEditorUpdateContext *update_ctx, int update continue; } View3D *v3d = sa->spacedata.first; - for (ar = sa->regionbase.first; ar; ar = ar->next) { - if (ar->regiontype != RGN_TYPE_WINDOW) { + for (region = sa->regionbase.first; region; region = region->next) { + if (region->regiontype != RGN_TYPE_WINDOW) { continue; } - RegionView3D *rv3d = ar->regiondata; + RegionView3D *rv3d = region->regiondata; RenderEngine *engine = rv3d->render_engine; /* call update if the scene changed, or if the render engine * tagged itself for update (e.g. because it was busy at the @@ -129,7 +129,7 @@ void ED_render_scene_update(const DEGEditorUpdateContext *update_ctx, int update CTX_wm_screen_set(C, sc); CTX_wm_area_set(C, sa); - CTX_wm_region_set(C, ar); + CTX_wm_region_set(C, region); engine->flag &= ~RE_ENGINE_DO_UPDATE; /* NOTE: Important to pass non-updated depsgraph, This is because this function is called @@ -145,7 +145,7 @@ void ED_render_scene_update(const DEGEditorUpdateContext *update_ctx, int update .depsgraph = update_ctx->depsgraph, .scene = scene, .view_layer = view_layer, - .ar = ar, + .region = region, .v3d = (View3D *)sa->spacedata.first, .engine_type = engine_type, })); @@ -163,18 +163,18 @@ void ED_render_scene_update(const DEGEditorUpdateContext *update_ctx, int update void ED_render_engine_area_exit(Main *bmain, ScrArea *sa) { /* clear all render engines in this area */ - ARegion *ar; + ARegion *region; wmWindowManager *wm = bmain->wm.first; if (sa->spacetype != SPACE_VIEW3D) { return; } - for (ar = sa->regionbase.first; ar; ar = ar->next) { - if (ar->regiontype != RGN_TYPE_WINDOW || !(ar->regiondata)) { + for (region = sa->regionbase.first; region; region = region->next) { + if (region->regiontype != RGN_TYPE_WINDOW || !(region->regiondata)) { continue; } - ED_view3d_stop_render_preview(wm, ar); + ED_view3d_stop_render_preview(wm, region); } } |