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
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2011-12-19 18:23:24 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-12-19 18:23:24 +0400
commit27df40f87f5b4d104023f834573ce67414fbc0de (patch)
tree2afd4fb9af7fae1e33db3d6adeee5197c3660274 /intern/cycles/blender/blender_camera.cpp
parenta64d92eb13f423d333ca37cec69fb85834c5d0cb (diff)
Fix #29653: fix wrong cycles depth of field distance when rendering with a
scaled camera.
Diffstat (limited to 'intern/cycles/blender/blender_camera.cpp')
-rw-r--r--intern/cycles/blender/blender_camera.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp
index 2a2c2a7c643..442a8f62bfd 100644
--- a/intern/cycles/blender/blender_camera.cpp
+++ b/intern/cycles/blender/blender_camera.cpp
@@ -207,6 +207,7 @@ static void blender_camera_sync(Camera *cam, BlenderCamera *bcam, int width, int
/* transform, note the blender camera points along the negative z-axis */
cam->matrix = bcam->matrix * transform_scale(1.0f, 1.0f, -1.0f);
+ cam->matrix = transform_clear_scale(cam->matrix);
/* set update flag */
if(cam->modified(prevcam))