kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix #29653: fix wrong cycles depth of field distance when rendering with a

Browse Source 
scaled camera.
This commit is contained in:
Brecht Van Lommel 2011-12-19 14:23:24 +00:00
parent a64d92eb13
commit 27df40f87f
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
intern/cycles/blender/blender_camera.cpp
View File

@ -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))

18
intern/cycles/util/util_transform.h
View File

@ -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