diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-03-21 06:38:11 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-03-21 06:38:11 +0400 |
commit | 5dbe5fc4963cf4a2bb9dc9c43a20c2f4b763109d (patch) | |
tree | 8f7b615d083201c0cd60dcba69556251470ea2e2 /intern/cycles/blender/blender_camera.cpp | |
parent | 8655be437dc46af6b64e3d1e96dba5173cce9450 (diff) |
Fix #34700: cycles depth of field now works with orthographic cameras too.
Diffstat (limited to 'intern/cycles/blender/blender_camera.cpp')
-rw-r--r-- | intern/cycles/blender/blender_camera.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp index b06ece049f1..6797ed6b71e 100644 --- a/intern/cycles/blender/blender_camera.cpp +++ b/intern/cycles/blender/blender_camera.cpp @@ -156,7 +156,12 @@ static void blender_camera_from_object(BlenderCamera *bcam, BL::Object b_ob, boo if(aperture_type == 1) { float fstop = RNA_float_get(&ccamera, "aperture_fstop"); - bcam->aperturesize = (bcam->lens*1e-3f)/(2.0f*max(fstop, 1e-5f)); + fstop = max(fstop, 1e-5f); + + if(bcam->type == CAMERA_ORTHOGRAPHIC) + bcam->aperturesize = 1.0f/(2.0f*fstop); + else + bcam->aperturesize = (bcam->lens*1e-3f)/(2.0f*fstop); } else bcam->aperturesize = RNA_float_get(&ccamera, "aperture_size"); |