diff options
| author | Thomas Dinges <blender@dingto.org> | 2015-10-25 02:12:29 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2015-10-26 13:52:24 +0300 |
| commit | 72592cfbe0ea8dc6af3d17c5ea4126121b997a70 (patch) | |
| tree | 3ec361566fa540a176be079c52f9a303674bf351 /intern/cycles/blender/blender_camera.cpp | |
| parent | 04ff2784da884675366091f88a08734e6ddbbce8 (diff) | |
Cleanup: Move pixel aspect to blender_camera_init().
Diffstat (limited to 'intern/cycles/blender/blender_camera.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_camera.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp index 491b5632ed5..7cb5e38d4e5 100644 --- a/intern/cycles/blender/blender_camera.cpp +++ b/intern/cycles/blender/blender_camera.cpp @@ -95,6 +95,10 @@ static void blender_camera_init(BlenderCamera *bcam, BL::RenderSettings b_render /* render resolution */ bcam->full_width = render_resolution_x(b_render); bcam->full_height = render_resolution_y(b_render); + + /* pixel aspect */ + bcam->pixelaspect.x = b_render.pixel_aspect_x(); + bcam->pixelaspect.y = b_render.pixel_aspect_y(); } static float blender_camera_focal_distance(BL::RenderEngine b_engine, BL::Object b_ob, BL::Camera b_camera) @@ -507,10 +511,6 @@ void BlenderSync::sync_camera_motion(BL::RenderSettings b_render, float aspectratio, sensor_size; blender_camera_init(&bcam, b_render); - /* TODO(sergey): Consider making it a part of blender_camera_init(). */ - bcam.pixelaspect.x = b_render.pixel_aspect_x(); - bcam.pixelaspect.y = b_render.pixel_aspect_y(); - blender_camera_from_object(&bcam, b_engine, b_ob); blender_camera_viewplane(&bcam, width, height, |