Commit: 72592cfbe0ea8dc6af3d17c5ea4126121b997a70
Author: Thomas Dinges
Date: Sun Oct 25 01:12:29 2015 +0200
Branches: master
https://developer.blender.org/rB72592cfbe0ea8dc6af3d17c5ea4126121b997a70
Cleanup: Move pixel aspect to blender_camera_init().
===================================================================
M intern/cycles/blender/blender_camera.cpp
===================================================================
diff --git a/intern/cycles/blender/blender_camera.cpp
b/intern/cycles/blender/blender_camera.cpp
index 491b563..7cb5e38 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,
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
