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_render.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_render.c')
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_render.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_render.c b/source/blender/draw/engines/eevee/eevee_render.c index 2d3cb440c7c..6cb3fa259eb 100644 --- a/source/blender/draw/engines/eevee/eevee_render.c +++ b/source/blender/draw/engines/eevee/eevee_render.c @@ -96,10 +96,10 @@ void EEVEE_render_init(EEVEE_Data *ved, RenderEngine *engine, struct Depsgraph * /* Set the pers & view matrix. */ /* TODO(sergey): Shall render hold pointer to an evaluated camera instead? */ - struct Object *camera = DEG_get_evaluated_object(depsgraph, RE_GetCamera(engine->re)); + struct Object *ob_camera_eval = DEG_get_evaluated_object(depsgraph, RE_GetCamera(engine->re)); float frame = BKE_scene_frame_get(scene); - RE_GetCameraWindow(engine->re, camera, frame, g_data->winmat); - RE_GetCameraModelMatrix(engine->re, camera, g_data->viewinv); + RE_GetCameraWindow(engine->re, ob_camera_eval, frame, g_data->winmat); + RE_GetCameraModelMatrix(engine->re, ob_camera_eval, g_data->viewinv); invert_m4_m4(g_data->viewmat, g_data->viewinv); mul_m4_m4m4(g_data->persmat, g_data->winmat, g_data->viewmat); @@ -114,7 +114,7 @@ void EEVEE_render_init(EEVEE_Data *ved, RenderEngine *engine, struct Depsgraph * DRW_viewport_matrix_override_set(g_data->viewinv, DRW_MAT_VIEWINV); /* EEVEE_effects_init needs to go first for TAA */ - EEVEE_effects_init(sldata, vedata, camera); + EEVEE_effects_init(sldata, vedata, ob_camera_eval); EEVEE_materials_init(sldata, stl, fbl); EEVEE_lights_init(sldata); EEVEE_lightprobes_init(sldata, vedata); |