diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-22 08:48:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-22 08:48:12 +0300 |
| commit | 17778ddeb7dbb95d75b61fe7f20185111d5cb2c1 (patch) | |
| tree | a848b7e5c74c879abbde40f45d120655111acac6 /source/blender/draw/engines/eevee/eevee_motion_blur.c | |
| parent | ac476375b1755c994cc7d160bba827e4aed73597 (diff) | |
Cleanup: naming
Use 'ob' prefix for objects, 'eval' suffix for evaluated data.
Diffstat (limited to 'source/blender/draw/engines/eevee/eevee_motion_blur.c')
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_motion_blur.c | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_motion_blur.c b/source/blender/draw/engines/eevee/eevee_motion_blur.c index f7e0eeaa643..b2ea9ff4229 100644 --- a/source/blender/draw/engines/eevee/eevee_motion_blur.c +++ b/source/blender/draw/engines/eevee/eevee_motion_blur.c @@ -121,14 +121,15 @@ int EEVEE_motion_blur_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *veda float persmat[4][4]; float ctime = DEG_get_ctime(draw_ctx->depsgraph); float delta = scene_eval->eevee.motion_blur_shutter; - Object *camera_object = DEG_get_evaluated_object(draw_ctx->depsgraph, camera); + Object *ob_camera_eval = DEG_get_evaluated_object(draw_ctx->depsgraph, camera); /* Current matrix */ - eevee_motion_blur_camera_get_matrix_at_time(scene, - ar, rv3d, v3d, - camera_object, - ctime, - effects->current_ndc_to_world); + eevee_motion_blur_camera_get_matrix_at_time( + scene, + ar, rv3d, v3d, + ob_camera_eval, + ctime, + effects->current_ndc_to_world); /* Viewport Matrix */ DRW_viewport_matrix_get(persmat, DRW_MAT_PERS); @@ -138,19 +139,21 @@ int EEVEE_motion_blur_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *veda compare_m4m4(persmat, effects->current_ndc_to_world, 0.0001f)) { /* Past matrix */ - eevee_motion_blur_camera_get_matrix_at_time(scene, - ar, rv3d, v3d, - camera_object, - ctime - delta, - effects->past_world_to_ndc); + eevee_motion_blur_camera_get_matrix_at_time( + scene, + ar, 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, - camera_object, - ctime + delta, - effects->future_world_to_ndc); + eevee_motion_blur_camera_get_matrix_at_time( + scene, + ar, rv3d, v3d, + ob_camera_eval, + ctime + delta, + effects->future_world_to_ndc); #endif invert_m4(effects->current_ndc_to_world); |