Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-10-15 17:32:18 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-10-15 17:33:02 +0300
commit2746bbe30ece2636e1231930cdaac9d897ebe717 (patch)
tree7ecdb3d0e6414351fa29d4303acebf481f2fb978 /intern
parentfa3dd5d9f43253898ed2a387d07f8fd3cd52f0c6 (diff)
Fix T46493: Wrong camera zoom blur with non-unit pixel aspect
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/blender_camera.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp
index 04926f94c62..491b5632ed5 100644
--- a/intern/cycles/blender/blender_camera.cpp
+++ b/intern/cycles/blender/blender_camera.cpp
@@ -506,6 +506,11 @@ void BlenderSync::sync_camera_motion(BL::RenderSettings b_render,
BlenderCamera bcam;
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,