Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2021-10-28 22:42:20 +0300
committerBrecht Van Lommel <brecht@blender.org>2021-10-28 22:43:08 +0300
commit049510f42580b7948ddca5eb36fd30dbe0143626 (patch)
tree9794e87de454fcc3989e3d6e6f319f1b73d17cca /intern/cycles/scene
parent673984b222dbb33239ae89fd32f0d2a1de586b71 (diff)
Fix T92491: Cycles panoramic camera inside volume fails with near clipping
Diffstat (limited to 'intern/cycles/scene')
-rw-r--r--intern/cycles/scene/camera.cpp22
1 files changed, 13 insertions, 9 deletions
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 {