[Bf-blender-cvs] [d8e01150d63] master: Fix T94752: Cycles renders stereoscopic panoramas incorrectly

[Lukas Stockner]

Commit: d8e01150d6356b171f03021dd6abcae39f3a7c81
Author: Lukas Stockner
Date:   Sat Jan 7 21:55:37 2023 +0100
Branches: master
https://developer.blender.org/rBd8e01150d6356b171f03021dd6abcae39f3a7c81

Fix T94752: Cycles renders stereoscopic panoramas incorrectly

The bug is caused by rBb66b3f547c43e841a7d5da0ecb2c911628339f56.
>From what I can see, that fix was intended to enable manual lens shift for
panorama cameras, but it appears that it also unintentionally applies
interocular shift.

This fix disables the multiview shift for panorama cameras, that way manual lens
shift still works but we get the 2.x behavior for stereoscopic renders back.

Differential Revision: https://developer.blender.org/D16950

===================================================================

M	source/blender/blenkernel/intern/camera.c

===================================================================

diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c
index 7c1193d80ab..2d5dc9010bf 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -1119,6 +1119,9 @@ float BKE_camera_multiview_shift_x(const RenderData *rd,
   if (rd->views_format == SCE_VIEWS_FORMAT_MULTIVIEW) {
     return data->shiftx;
   }
+  if (data->type == CAM_PANO) {
+    return data->shiftx;
+  }
   /* SCE_VIEWS_SETUP_BASIC */
   return camera_stereo3d_shift_x(camera, viewname);
 }