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/draw/engines/eevee/eevee_motion_blur.c | |
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/draw/engines/eevee/eevee_motion_blur.c')
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_motion_blur.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_motion_blur.c b/source/blender/draw/engines/eevee/eevee_motion_blur.c index fc5af62d45f..80c38839b71 100644 --- a/source/blender/draw/engines/eevee/eevee_motion_blur.c +++ b/source/blender/draw/engines/eevee/eevee_motion_blur.c @@ -48,7 +48,7 @@ static struct { extern char datatoc_effect_motion_blur_frag_glsl[]; static void eevee_motion_blur_camera_get_matrix_at_time(Scene *scene, - ARegion *ar, + ARegion *region, RegionView3D *rv3d, View3D *v3d, Object *camera, @@ -83,7 +83,7 @@ static void eevee_motion_blur_camera_get_matrix_at_time(Scene *scene, if (v3d != NULL) { BKE_camera_params_from_view3d(¶ms, draw_ctx->depsgraph, v3d, rv3d); - BKE_camera_params_compute_viewplane(¶ms, ar->winx, ar->winy, 1.0f, 1.0f); + BKE_camera_params_compute_viewplane(¶ms, region->winx, region->winy, 1.0f, 1.0f); } else { BKE_camera_params_from_object(¶ms, &cam_cpy); @@ -115,7 +115,7 @@ int EEVEE_motion_blur_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *veda View3D *v3d = draw_ctx->v3d; RegionView3D *rv3d = draw_ctx->rv3d; - ARegion *ar = draw_ctx->ar; + ARegion *region = draw_ctx->region; if (scene_eval->eevee.flag & SCE_EEVEE_MOTION_BLUR_ENABLED) { /* Update Motion Blur Matrices */ @@ -151,7 +151,7 @@ int EEVEE_motion_blur_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *veda /* Current matrix */ if (effects->motion_blur_mat_cached == false) { eevee_motion_blur_camera_get_matrix_at_time( - scene, ar, rv3d, v3d, ob_camera_eval, ctime, effects->current_world_to_ndc); + scene, region, rv3d, v3d, ob_camera_eval, ctime, effects->current_world_to_ndc); } /* Only continue if camera is not being keyed */ @@ -160,12 +160,12 @@ int EEVEE_motion_blur_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *veda /* Past matrix */ if (effects->motion_blur_mat_cached == false) { eevee_motion_blur_camera_get_matrix_at_time( - scene, ar, rv3d, v3d, ob_camera_eval, ctime - delta, effects->past_world_to_ndc); + scene, region, rv3d, v3d, ob_camera_eval, ctime - delta, effects->past_world_to_ndc); #if 0 /* for future high quality blur */ /* Future matrix */ eevee_motion_blur_camera_get_matrix_at_time( - scene, ar, rv3d, v3d, ob_camera_eval, ctime + delta, effects->future_world_to_ndc); + scene, region, rv3d, v3d, ob_camera_eval, ctime + delta, effects->future_world_to_ndc); #endif invert_m4_m4(effects->current_ndc_to_world, effects->current_world_to_ndc); } |