Cleanup: Move pixel aspect to blender_camera_init().
authorThomas Dinges <blender@dingto.org>
Sat, 24 Oct 2015 23:12:29 +0000 (01:12 +0200)
committerThomas Dinges <blender@dingto.org>
Mon, 26 Oct 2015 10:52:24 +0000 (11:52 +0100)
intern/cycles/blender/blender_camera.cpp

index 491b5632ed546a732fe731d30f60f7c0f249221f..7cb5e38d4e53ede315413afe450469870ce7a1aa 100644 (file)
@@ -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,