Fix Look Dev default profile not updating correctly #630

Author: JulienIgnace-Unity

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

@@ -1,4 +1,4 @@
-# Changelog
+# Changelog
 All notable changes to this package will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed SceneView Draw Modes not being properly updated after opening new scene view panels or changing the editor layout.
 - Fixed depth prepass and postpass being disabled after changing the shader in the material UI.
 - Fix an issue in reading the gbuffer for ray traced subsurface scattering (case 1248358).
+- Fixed an issue where editing the Look Dev default profile would not reflect directly in the Look Dev window.
 
 ### Changed
 - Shadowmask and realtime reflection probe property are hide in Quality settings

com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LookDev.cs

@@ -5,6 +5,8 @@ namespace UnityEngine.Rendering.HighDefinition
 {
     public partial class HDRenderPipeline : IDataProvider
     {
+        int m_LookDevVolumeProfileHash = -1;
+
         struct LookDevDataForHDRP
         {
             public HDAdditionalCameraData additionalCameraData;
@@ -14,6 +16,65 @@ struct LookDevDataForHDRP
             public Volume volume;
         }
 
+#if UNITY_EDITOR
+        bool UpdateVolumeProfile(Volume volume, out VisualEnvironment visualEnvironment, out HDRISky sky)
+        {
+            HDRenderPipelineAsset hdrpAsset = GraphicsSettings.renderPipelineAsset as HDRenderPipelineAsset;
+            if (hdrpAsset.defaultLookDevProfile == null)
+                hdrpAsset.defaultLookDevProfile = hdrpAsset.renderPipelineEditorResources.lookDev.defaultLookDevVolumeProfile;
+
+            int newHashCode = hdrpAsset.defaultLookDevProfile.GetHashCode();
+            if (newHashCode != m_LookDevVolumeProfileHash)
+            {
+                VolumeProfile oldProfile = volume.sharedProfile;
+
+                m_LookDevVolumeProfileHash = newHashCode;
+
+                VolumeProfile profile = ScriptableObject.Instantiate(hdrpAsset.defaultLookDevProfile);
+                volume.sharedProfile = profile;
+
+                // Remove potentially existing components in the user profile.
+                if (profile.TryGet(out visualEnvironment))
+                    profile.Remove<VisualEnvironment>();
+
+                if (profile.TryGet(out sky))
+                    profile.Remove<HDRISky>();
+
+                // If there was a profile before we needed to re-instantiate the new profile, we need to copy the data over for sky settings.
+                if (oldProfile != null)
+                {
+                    if (oldProfile.TryGet(out HDRISky oldSky))
+                    {
+                        sky = Object.Instantiate(oldSky);
+                        profile.components.Add(sky);
+                    }
+                    if (oldProfile.TryGet(out VisualEnvironment oldVisualEnv))
+                    {
+                        visualEnvironment = Object.Instantiate(oldVisualEnv);
+                        profile.components.Add(visualEnvironment);
+                    }
+
+                    CoreUtils.Destroy(oldProfile);
+                }
+                else
+                {
+                    visualEnvironment = profile.Add<VisualEnvironment>();
+                    visualEnvironment.skyType.Override((int)SkyType.HDRI);
+                    visualEnvironment.skyAmbientMode.Override(SkyAmbientMode.Dynamic);
+                    sky = profile.Add<HDRISky>();
+                }
+
+                return true;
+            }
+            else
+            {
+                visualEnvironment = null;
+                sky = null;
+                return false;
+            }
+        }
+#endif
+
         /// <summary>
         /// This hook allows HDRP to init the scene when creating the view
         /// </summary>
@@ -51,24 +112,11 @@ void IDataProvider.FirstInitScene(StageRuntimeInterface SRI)
             volume.priority = float.MaxValue;
             volume.enabled = false;
 
-#if UNITY_EDITOR
-            HDRenderPipelineAsset hdrpAsset = GraphicsSettings.renderPipelineAsset as HDRenderPipelineAsset;
-            if (hdrpAsset.defaultLookDevProfile == null)
-                hdrpAsset.defaultLookDevProfile = hdrpAsset.renderPipelineEditorResources.lookDev.defaultLookDevVolumeProfile;
-            VolumeProfile profile = ScriptableObject.Instantiate(hdrpAsset.defaultLookDevProfile);
-            volume.sharedProfile = profile;
-
-            VisualEnvironment visualEnvironment;
-            if (profile.TryGet(out visualEnvironment))
-                profile.Remove<VisualEnvironment>();
-            visualEnvironment = profile.Add<VisualEnvironment>();
-            visualEnvironment.skyType.Override((int)SkyType.HDRI);
-            visualEnvironment.skyAmbientMode.Override(SkyAmbientMode.Dynamic);
 
-            HDRISky sky;
-            if (profile.TryGet(out sky))
-                profile.Remove<HDRISky>();
-            sky = profile.Add<HDRISky>();
+#if UNITY_EDITOR
+            // Make sure we invalidate the current volume when first loading a scene.
+            m_LookDevVolumeProfileHash = -1;
+            UpdateVolumeProfile(volume, out var visualEnvironment, out var sky);
 
             SRI.SRPData = new LookDevDataForHDRP()
             {
@@ -79,7 +127,7 @@ void IDataProvider.FirstInitScene(StageRuntimeInterface SRI)
                 volume = volume
             };
 #else
-            //remove unasigned warnings when building
+            //remove unassigned warnings when building
             SRI.SRPData = new LookDevDataForHDRP()
             {
                 additionalCameraData = null,
@@ -122,6 +170,15 @@ void IDataProvider.UpdateSky(Camera camera, Sky sky, StageRuntimeInterface SRI)
         void IDataProvider.OnBeginRendering(StageRuntimeInterface SRI)
         {
             LookDevDataForHDRP data = (LookDevDataForHDRP)SRI.SRPData;
+#if UNITY_EDITOR
+            // The default volume can change in the HDRP asset so if it does we need to re-instantiate it.
+            if (UpdateVolumeProfile(data.volume, out var visualEnv, out var sky))
+            {
+                data.sky = sky;
+                data.visualEnvironment = visualEnv;
+                SRI.SRPData = data;
+            }
+#endif
             data.volume.enabled = true;
         }