Fixed range fields for depth of field #6285

Author: adrien-de-tocqueville

com.unity.render-pipelines.high-definition/CHANGELOG.md

@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed SpeedTree graph compatibility by removing custom interpolators.
 - Fixed edges and ghosting appearing on shadow matte due to the shadow being black outside the range of the light (case 1371441).
 - Fixed interpolation issue with wind orientation (case 1379841).
+- Fixed range fields for depth of field (case 1376609).
 
 ## [12.1.2] - 2021-10-22
 

com.unity.render-pipelines.high-definition/Editor/PostProcessing/DepthOfFieldEditor.cs

@@ -117,10 +117,55 @@ void DrawFocusSettings(int mode)
             }
             else if (mode == (int)DepthOfFieldMode.Manual)
             {
+                EditorGUI.BeginChangeCheck();
                 PropertyField(m_NearFocusStart, Styles.k_NearFocusStart);
+                if (EditorGUI.EndChangeCheck())
+                {
+                    float maxBound = m_NearFocusEnd.overrideState.boolValue ? m_NearFocusEnd.value.floatValue :
+                        m_FarFocusStart.overrideState.boolValue ? m_FarFocusStart.value.floatValue :
+                        m_FarFocusEnd.overrideState.boolValue ? m_FarFocusEnd.value.floatValue : float.MaxValue;
+                    if (m_NearFocusStart.value.floatValue >= maxBound)
+                        m_NearFocusStart.value.floatValue = maxBound - 1e-5f;
+                }
+
+                EditorGUI.BeginChangeCheck();
                 PropertyField(m_NearFocusEnd, Styles.k_NearFocusEnd);
+                if (EditorGUI.EndChangeCheck())
+                {
+                    float minBound = m_NearFocusStart.overrideState.boolValue ? m_NearFocusStart.value.floatValue : float.MinValue;
+                    if (m_NearFocusEnd.value.floatValue <= minBound)
+                        m_NearFocusEnd.value.floatValue = minBound + 1e-5f;
+
+                    float maxBound =  m_FarFocusStart.overrideState.boolValue ? m_FarFocusStart.value.floatValue :
+                        m_FarFocusEnd.overrideState.boolValue ? m_FarFocusEnd.value.floatValue : float.MaxValue;
+                    if (m_NearFocusEnd.value.floatValue >= maxBound)
+                        m_NearFocusEnd.value.floatValue = maxBound - 1e-5f;
+                }
+
+                EditorGUI.BeginChangeCheck();
                 PropertyField(m_FarFocusStart, Styles.k_FarFocusStart);
+                if (EditorGUI.EndChangeCheck())
+                {
+                    float minBound = m_NearFocusEnd.overrideState.boolValue ? m_NearFocusEnd.value.floatValue :
+                        m_NearFocusStart.overrideState.boolValue ? m_NearFocusStart.value.floatValue : float.MinValue;
+                    if (m_FarFocusStart.value.floatValue <= minBound)
+                        m_FarFocusStart.value.floatValue = minBound + 1e-5f;
+
+                    float maxBound = m_FarFocusEnd.overrideState.boolValue ? m_FarFocusEnd.value.floatValue : float.MaxValue;
+                    if (m_FarFocusStart.value.floatValue >= maxBound)
+                        m_FarFocusStart.value.floatValue = maxBound - 1e-5f;
+                }
+
+                EditorGUI.BeginChangeCheck();
                 PropertyField(m_FarFocusEnd, Styles.k_FarFocusEnd);
+                if (EditorGUI.EndChangeCheck())
+                {
+                    float minBound = m_FarFocusStart.overrideState.boolValue ? m_FarFocusStart.value.floatValue :
+                        m_NearFocusEnd.overrideState.boolValue ? m_NearFocusEnd.value.floatValue :
+                        m_NearFocusStart.overrideState.boolValue ? m_NearFocusStart.value.floatValue : float.MinValue;
+                    if (m_FarFocusEnd.value.floatValue <= minBound)
+                        m_FarFocusEnd.value.floatValue = minBound + 1e-5f;
+                }
             }
         }