From 049510f42580b7948ddca5eb36fd30dbe0143626 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 28 Oct 2021 21:42:20 +0200 Subject: Fix T92491: Cycles panoramic camera inside volume fails with near clipping --- intern/cycles/scene/camera.cpp | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'intern/cycles/scene') diff --git a/intern/cycles/scene/camera.cpp b/intern/cycles/scene/camera.cpp index 5877b82ead5..5bafe736fb5 100644 --- a/intern/cycles/scene/camera.cpp +++ b/intern/cycles/scene/camera.cpp @@ -592,22 +592,26 @@ BoundBox Camera::viewplane_bounds_get() if (camera_type == CAMERA_PANORAMA) { if (use_spherical_stereo == false) { - bounds.grow(make_float3(cameratoworld.x.w, cameratoworld.y.w, cameratoworld.z.w)); + bounds.grow(make_float3(cameratoworld.x.w, cameratoworld.y.w, cameratoworld.z.w), nearclip); } else { float half_eye_distance = interocular_distance * 0.5f; - bounds.grow(make_float3( - cameratoworld.x.w + half_eye_distance, cameratoworld.y.w, cameratoworld.z.w)); + bounds.grow( + make_float3(cameratoworld.x.w + half_eye_distance, cameratoworld.y.w, cameratoworld.z.w), + nearclip); - bounds.grow(make_float3( - cameratoworld.z.w, cameratoworld.y.w + half_eye_distance, cameratoworld.z.w)); + bounds.grow( + make_float3(cameratoworld.z.w, cameratoworld.y.w + half_eye_distance, cameratoworld.z.w), + nearclip); - bounds.grow(make_float3( - cameratoworld.x.w - half_eye_distance, cameratoworld.y.w, cameratoworld.z.w)); + bounds.grow( + make_float3(cameratoworld.x.w - half_eye_distance, cameratoworld.y.w, cameratoworld.z.w), + nearclip); - bounds.grow(make_float3( - cameratoworld.x.w, cameratoworld.y.w - half_eye_distance, cameratoworld.z.w)); + bounds.grow( + make_float3(cameratoworld.x.w, cameratoworld.y.w - half_eye_distance, cameratoworld.z.w), + nearclip); } } else { -- cgit v1.2.3