From 27df40f87f5b4d104023f834573ce67414fbc0de Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 19 Dec 2011 14:23:24 +0000 Subject: [PATCH] Fix #29653: fix wrong cycles depth of field distance when rendering with a scaled camera. --- intern/cycles/blender/blender_camera.cpp | 1 + intern/cycles/util/util_transform.h | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) 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)) diff --git a/intern/cycles/util/util_transform.h b/intern/cycles/util/util_transform.h index 4bf3759dd75..07db52f6392 100644 --- a/intern/cycles/util/util_transform.h +++ b/intern/cycles/util/util_transform.h @@ -209,6 +209,13 @@ __device_inline float3 transform_get_column(const Transform *t, int column) return make_float3(t->x[column], t->y[column], t->z[column]); } +__device_inline void transform_set_column(Transform *t, int column, float3 value) +{ + t->x[column] = value.x; + t->y[column] = value.y; + t->z[column] = value.z; +} + Transform transform_inverse(const Transform& a); __device_inline bool transform_uniform_scale(const Transform& tfm, float& scale) @@ -244,6 +251,17 @@ __device_inline bool transform_negative_scale(const Transform& tfm) return (dot(cross(c0, c1), c2) < 0.0f); } +__device_inline Transform transform_clear_scale(const Transform& tfm) +{ + Transform ntfm = tfm; + + transform_set_column(&ntfm, 0, normalize(transform_get_column(&ntfm, 0))); + transform_set_column(&ntfm, 1, normalize(transform_get_column(&ntfm, 1))); + transform_set_column(&ntfm, 2, normalize(transform_get_column(&ntfm, 2))); + + return ntfm; +} + #endif CCL_NAMESPACE_END