diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-28 12:54:08 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2016-06-08 22:45:40 +0300 |
| commit | d4a70b303b83196df0be5edcf8e5120c2c447b8f (patch) | |
| tree | c3bab75dba65e7357d6a5a2a1b36e9b965226e4a /intern/cycles/blender | |
| parent | 49ae0c50d947c58e756f9f541382f438f1138cc7 (diff) | |
Fix T48526: Cycles viewport render incorrectly influenced by pixel aspect ratio.
This reverts 72592cfb, needs more refactoring to do that cleanup.
Diffstat (limited to 'intern/cycles/blender')
| -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 9dec489ce33..3a0fee23c0d 100644 --- a/intern/cycles/blender/blender_camera.cpp +++ b/intern/cycles/blender/blender_camera.cpp @@ -108,10 +108,6 @@ static void blender_camera_init(BlenderCamera *bcam, /* 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, @@ -563,6 +559,10 @@ 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, |