Unity-Technologies · kecho · Oct 26, 2021 · Oct 25, 2021 · Oct 25, 2021
diff --git a/...ges/Linear/LinuxEditor/Vulkan/None/4070_PhysicalCamera-iso-aperture-shutter.png b/...ges/Linear/LinuxEditor/Vulkan/None/4070_PhysicalCamera-iso-aperture-shutter.png
diff --git a/...ages/Linear/LinuxEditor/Vulkan/None/4071_PhysicalCamera-Aperture-bladeCount.png b/...ages/Linear/LinuxEditor/Vulkan/None/4071_PhysicalCamera-Aperture-bladeCount.png
diff --git a/...mages/Linear/LinuxEditor/Vulkan/None/4072_PhysicalCamera-Aperture-curvature.png b/...mages/Linear/LinuxEditor/Vulkan/None/4072_PhysicalCamera-Aperture-curvature.png
diff --git a/.../Linear/LinuxEditor/Vulkan/None/4073_PhysicalCamera-Aperture-barrelClipping.png b/.../Linear/LinuxEditor/Vulkan/None/4073_PhysicalCamera-Aperture-barrelClipping.png
diff --git a/...ges/Linear/LinuxEditor/Vulkan/None/4074_PhysicalCamera-Aperture-anamorphism.png b/...ges/Linear/LinuxEditor/Vulkan/None/4074_PhysicalCamera-Aperture-anamorphism.png
diff --git a/...Images/Linear/OSXEditor/Metal/None/4070_PhysicalCamera-iso-aperture-shutter.png b/...Images/Linear/OSXEditor/Metal/None/4070_PhysicalCamera-iso-aperture-shutter.png
diff --git a/...eImages/Linear/OSXEditor/Metal/None/4071_PhysicalCamera-Aperture-bladeCount.png b/...eImages/Linear/OSXEditor/Metal/None/4071_PhysicalCamera-Aperture-bladeCount.png
diff --git a/...ceImages/Linear/OSXEditor/Metal/None/4072_PhysicalCamera-Aperture-curvature.png b/...ceImages/Linear/OSXEditor/Metal/None/4072_PhysicalCamera-Aperture-curvature.png
diff --git a/...ges/Linear/OSXEditor/Metal/None/4073_PhysicalCamera-Aperture-barrelClipping.png b/...ges/Linear/OSXEditor/Metal/None/4073_PhysicalCamera-Aperture-barrelClipping.png
diff --git a/...Images/Linear/OSXEditor/Metal/None/4074_PhysicalCamera-Aperture-anamorphism.png b/...Images/Linear/OSXEditor/Metal/None/4074_PhysicalCamera-Aperture-anamorphism.png
diff --git a/...near/WindowsEditor/Direct3D11/None/4070_PhysicalCamera-iso-aperture-shutter.png b/...near/WindowsEditor/Direct3D11/None/4070_PhysicalCamera-iso-aperture-shutter.png
diff --git a/...inear/WindowsEditor/Direct3D11/None/4071_PhysicalCamera-Aperture-bladeCount.png b/...inear/WindowsEditor/Direct3D11/None/4071_PhysicalCamera-Aperture-bladeCount.png
diff --git a/...Linear/WindowsEditor/Direct3D11/None/4072_PhysicalCamera-Aperture-curvature.png b/...Linear/WindowsEditor/Direct3D11/None/4072_PhysicalCamera-Aperture-curvature.png
diff --git a/...r/WindowsEditor/Direct3D11/None/4073_PhysicalCamera-Aperture-barrelClipping.png b/...r/WindowsEditor/Direct3D11/None/4073_PhysicalCamera-Aperture-barrelClipping.png
diff --git a/...near/WindowsEditor/Direct3D11/None/4074_PhysicalCamera-Aperture-anamorphism.png b/...near/WindowsEditor/Direct3D11/None/4074_PhysicalCamera-Aperture-anamorphism.png
diff --git a/...near/WindowsEditor/Direct3D12/None/4070_PhysicalCamera-iso-aperture-shutter.png b/...near/WindowsEditor/Direct3D12/None/4070_PhysicalCamera-iso-aperture-shutter.png
diff --git a/...inear/WindowsEditor/Direct3D12/None/4071_PhysicalCamera-Aperture-bladeCount.png b/...inear/WindowsEditor/Direct3D12/None/4071_PhysicalCamera-Aperture-bladeCount.png
diff --git a/...Linear/WindowsEditor/Direct3D12/None/4072_PhysicalCamera-Aperture-curvature.png b/...Linear/WindowsEditor/Direct3D12/None/4072_PhysicalCamera-Aperture-curvature.png
diff --git a/...r/WindowsEditor/Direct3D12/None/4073_PhysicalCamera-Aperture-barrelClipping.png b/...r/WindowsEditor/Direct3D12/None/4073_PhysicalCamera-Aperture-barrelClipping.png
diff --git a/...near/WindowsEditor/Direct3D12/None/4074_PhysicalCamera-Aperture-anamorphism.png b/...near/WindowsEditor/Direct3D12/None/4074_PhysicalCamera-Aperture-anamorphism.png
diff --git a/...s/Linear/WindowsEditor/Vulkan/None/4070_PhysicalCamera-iso-aperture-shutter.png b/...s/Linear/WindowsEditor/Vulkan/None/4070_PhysicalCamera-iso-aperture-shutter.png
diff --git a/...es/Linear/WindowsEditor/Vulkan/None/4071_PhysicalCamera-Aperture-bladeCount.png b/...es/Linear/WindowsEditor/Vulkan/None/4071_PhysicalCamera-Aperture-bladeCount.png
diff --git a/...ges/Linear/WindowsEditor/Vulkan/None/4072_PhysicalCamera-Aperture-curvature.png b/...ges/Linear/WindowsEditor/Vulkan/None/4072_PhysicalCamera-Aperture-curvature.png
diff --git a/...inear/WindowsEditor/Vulkan/None/4073_PhysicalCamera-Aperture-barrelClipping.png b/...inear/WindowsEditor/Vulkan/None/4073_PhysicalCamera-Aperture-barrelClipping.png
diff --git a/...s/Linear/WindowsEditor/Vulkan/None/4074_PhysicalCamera-Aperture-anamorphism.png b/...s/Linear/WindowsEditor/Vulkan/None/4074_PhysicalCamera-Aperture-anamorphism.png
diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md
@@ -46,6 +46,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - HD's SpeedTree 8 upgrader now sets up CullModeForward as well.
 - Restructured data under Display Stats panel to use column layout.
 - Added controls for the users to manually feed the ray tracing acceleration structure that should be used for a given camera (case 1370678).
+- Depth of Field is now disabled in orthographic cameras - it was using the hidden perspective settings (case 1372582).
 
 ## [13.1.0] - 2021-09-24
 

diff --git a/...y.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs b/...y.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs
@@ -2864,6 +2864,7 @@ TextureHandle DepthOfFieldPass(RenderGraph renderGraph, HDCamera hdCamera, Textu
             bool postDoFTAAEnabled = false;
             bool isSceneView = hdCamera.camera.cameraType == CameraType.SceneView;
             bool taaEnabled = m_AntialiasingFS && hdCamera.antialiasing == HDAdditionalCameraData.AntialiasingMode.TemporalAntialiasing;
+            bool isOrtho = hdCamera.camera.orthographic;
 
             // If Path tracing is enabled, then DoF is computed in the path tracer by sampling the lens aperure (when using the physical camera mode)
             bool isDoFPathTraced = (hdCamera.frameSettings.IsEnabled(FrameSettingsField.RayTracing) &&
@@ -2873,7 +2874,7 @@ TextureHandle DepthOfFieldPass(RenderGraph renderGraph, HDCamera hdCamera, Textu
 
             // Depth of Field is done right after TAA as it's easier to just re-project the CoC
             // map rather than having to deal with all the implications of doing it before TAA
-            if (m_DepthOfField.IsActive() && !isSceneView && m_DepthOfFieldFS && !isDoFPathTraced)
+            if (m_DepthOfField.IsActive() && !isSceneView && m_DepthOfFieldFS && !isDoFPathTraced && !isOrtho)
             {
                 // If we switch DoF modes and the old one was not using TAA, make sure we invalidate the history
                 // Note: for Rendergraph the m_IsDoFHisotoryValid perhaps should be moved to the "pass data" struct