Fix unselectable None option in Rendering Debugger > Volume > Camera

Author: arttu-peltonen

Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugState.cs

@@ -182,6 +182,35 @@ public sealed class DebugStateInt : DebugState<int> { }
     [Serializable, DebugState(typeof(DebugUI.ObjectPopupField), typeof(DebugUI.CameraSelector), typeof(DebugUI.ObjectField))]
     public sealed class DebugStateObject : DebugState<UnityEngine.Object>
     {
+        [SerializeField] string m_UserData;
+
+        /// <inheritdoc/>
+        public override void SetValue(object value, DebugUI.IValueField field)
+        {
+            // DebugStateObject is used to serialize the selected camera reference in DebugUI.CameraSelector. For SceneView Camera this doesn't work because
+            // the camera is never saved and always recreated. So we use a special string to identify this case and restore the reference later.
+            if (field is DebugUI.CameraSelector && SceneView.lastActiveSceneView != null && (Camera)value == SceneView.lastActiveSceneView.camera)
+            {
+                m_UserData = "SceneViewCamera";
+            }
+            else
+            {
+                m_UserData = null;
+            }
+            base.SetValue(value, field);
+        }
+
+        /// <inheritdoc/>
+        public override object GetValue()
+        {
+            if (value == null && m_UserData != null && m_UserData == "SceneViewCamera" && SceneView.lastActiveSceneView != null && SceneView.lastActiveSceneView.camera != null)
+            {
+                value = SceneView.lastActiveSceneView.camera;
+            }
+
+            return base.GetValue();
+        }
+
         /// <summary>
         /// Returns the hash code of the Debug Item.
         /// </summary>

Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugDisplaySettingsVolumes.cs

@@ -59,23 +59,10 @@ public Type selectedComponentType
         /// <summary>Current camera to debug.</summary>
         public Camera selectedCamera
         {
-            get
-            {
-#if UNITY_EDITOR
-                // By default pick the one scene camera
-                if (m_SelectedCamera == null && SceneView.lastActiveSceneView != null)
-                {
-                    var sceneCamera = SceneView.lastActiveSceneView.camera;
-                    if (sceneCamera != null)
-                        m_SelectedCamera = sceneCamera;
-                }
-#endif
-
-                return m_SelectedCamera;
-            }
+            get => m_SelectedCamera;
             set
             {
-                if (value != null && value != m_SelectedCamera)
+                if (value != m_SelectedCamera)
                 {
                     m_SelectedCamera = value;
                     OnSelectionChanged();
@@ -333,7 +320,7 @@ public static DebugUI.EnumField CreateComponentSelector(SettingsPanel panel, Act
                 };
             }
 
-            public static DebugUI.ObjectPopupField CreateCameraSelector(SettingsPanel panel, Action<DebugUI.Field<Object>, Object> refresh)
+            public static DebugUI.CameraSelector CreateCameraSelector(SettingsPanel panel, Action<DebugUI.Field<Object>, Object> refresh)
             {
                 return new DebugUI.CameraSelector()
                 {
@@ -708,7 +695,14 @@ public override void Dispose()
             public SettingsPanel(DebugDisplaySettingsVolume data)
                 : base(data)
             {
-                AddWidget(WidgetFactory.CreateCameraSelector(this, (_, __) => Refresh()));
+                var cameraSelector = WidgetFactory.CreateCameraSelector(this, (_, __) => Refresh());
+
+                // Select first camera if none is selected
+                var availableCameras = cameraSelector.getObjects() as List<Camera>;
+                if (data.selectedCamera == null && availableCameras is { Count: > 0 })
+                    data.selectedCamera = availableCameras[0];
+
+                AddWidget(cameraSelector);
                 AddWidget(WidgetFactory.CreateComponentSelector(this, (_, __) => Refresh()));
 
                 Func<bool> hiddenCallback = () => data.selectedCamera == null || data.selectedComponent <= 0;

Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplaySettingsCamera.cs

@@ -10,29 +10,8 @@ class DebugDisplaySettingsCamera : IDebugDisplaySettingsData
         [Serializable]
         public class FrameSettingsDebugData
         {
-            private Camera m_SelectedCamera;
-            public Camera selectedCamera
-            {
-                get
-                {
-#if UNITY_EDITOR
-                    if (m_SelectedCamera == null && UnityEditor.SceneView.lastActiveSceneView != null)
-                    {
-                        var sceneCamera = UnityEditor.SceneView.lastActiveSceneView.camera;
-                        if (sceneCamera != null)
-                            m_SelectedCamera = sceneCamera;
-                    }
-#endif
-                    return m_SelectedCamera;
-                }
-                set
-                {
-                    if (value != null && value != m_SelectedCamera)
-                    {
-                        m_SelectedCamera = value;
-                    }
-                }
-            }
+            public Camera selectedCamera { get; set; }
+
             public Dictionary<Camera, (HDAdditionalCameraData, IDebugData)> registeredCameras = new ();
         }
 
@@ -98,8 +77,8 @@ public static DebugUI.CameraSelector CreateCameraSelector(SettingsPanel panel,
                     getter = () => panel.data.frameSettingsData.selectedCamera,
                     setter = value =>
                     {
-                        if (value is Camera cam && value != panel.data.frameSettingsData.selectedCamera)
-                            panel.data.frameSettingsData.selectedCamera = cam;
+                        if (value != panel.data.frameSettingsData.selectedCamera)
+                            panel.data.frameSettingsData.selectedCamera = value as Camera;
                     },
                     onValueChanged = refresh
                 };
@@ -134,6 +113,12 @@ public SettingsPanel(DebugDisplaySettingsCamera data)
                 : base(data)
             {
                 m_CameraSelector = WidgetFactory.CreateCameraSelector(this, (_, __) => Refresh());
+
+                // Select first camera if none is selected
+                var availableCameras = m_CameraSelector.getObjects() as List<Camera>;
+                if (data.frameSettingsData.selectedCamera == null && availableCameras is { Count: > 0 })
+                    data.frameSettingsData.selectedCamera = availableCameras[0];
+                
                 AddWidget(m_CameraSelector);
 
                 if (GetOrCreateFrameSettingsWidgets(out var frameSettingsWidgets))