Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Move pixel aspect to blender_camera_init().

Browse Source
This commit is contained in:
Thomas Dinges
2015-10-25 01:12:29 +02:00
parent 04ff2784da
commit 72592cfbe0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,6 +95,10 @@ static void blender_camera_init(BlenderCamera *bcam, BL::RenderSettings b_render
/* 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, BL::Object b_ob, BL::Camera b_camera) 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; 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,