bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix T48526: Cycles viewport render incorrectly influenced by pixel aspect ratio.

Browse Source 
This reverts 72592cfb, needs more refactoring to do that cleanup.
This commit is contained in:
Brecht Van Lommel 2016-05-28 11:54:08 +02:00
parent 739bf147a9
commit 62f85add48
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/blender/blender_camera.cpp
View File

@ -108,10 +108,6 @@ static void blender_camera_init(BlenderCamera *bcam,
/* render resolution */ /* render resolution */
bcam->full_width = render_resolution_x(b_render); bcam->full_width = render_resolution_x(b_render);
bcam->full_height = render_resolution_y(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, 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; float aspectratio, sensor_size;
blender_camera_init(&bcam, b_render); 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_from_object(&bcam, b_engine, b_ob);
blender_camera_viewplane(&bcam, blender_camera_viewplane(&bcam,
width, height, width, height,