diff options
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 2a7c1d3d943..5bc9dfc7904 100644 --- a/intern/cycles/blender/blender_camera.cpp +++ b/intern/cycles/blender/blender_camera.cpp @@ -175,7 +175,12 @@ static void blender_camera_from_object(BlenderCamera *bcam, bcam->longitude_max = RNA_float_get(&ccamera, "longitude_max"); bcam->interocular_distance = b_camera.stereo().interocular_distance(); - bcam->convergence_distance = b_camera.stereo().convergence_distance(); + if(b_camera.stereo().convergence_mode() == BL::CameraStereoData::convergence_mode_PARALLEL) { + bcam->convergence_distance = FLT_MAX; + } + else { + bcam->convergence_distance = b_camera.stereo().convergence_distance(); + } bcam->use_spherical_stereo = b_engine.use_spherical_stereo(b_ob); bcam->ortho_scale = b_camera.ortho_scale(); |