Merge pull request #8245 from Unity-Technologies/internal/6000.0/staging

Mirror Internal/6000.0/staging

Author: KEngelstoft

.gitattributes

@@ -375,6 +375,12 @@ Editor/Resources/unity[[:space:]]editor[[:space:]]resources filter=lfs diff=lfs
 # memoryprofiler test snapshots
 **/com.unity.memoryprofiler.tests/**/*.[sS][nN][aA][pP] filter=lfs diff=lfs merge=lfs -text
 
-
 # buginfo tools
 /Tools/Unity.BugInfo.Coverage/bin/* filter=lfs diff=lfs merge=lfs -text
+
+#SRP Templates
+/Templates/**/LightingData.asset binary
+/Templates/**/*.[pP][nN][gG] filter=lfs diff=lfs merge=lfs -text
+/Templates/**/*.[tT][gG][aA] filter=lfs diff=lfs merge=lfs -text
+/Templates/**/*.[tT][iI][fF] filter=lfs diff=lfs merge=lfs -text
+/Templates/**/*.[fF][bB][xX] filter=lfs diff=lfs merge=lfs -text

Packages/com.unity.render-pipelines.core/Documentation~/Images/videos/light-anchor-animation.mp4

@@ -451,7 +451,7 @@ void IEnvironmentDisplayer.Repaint()
         void OnFocus()
         {
             //OnFocus is called before OnEnable that open backend if not already opened, so only sync if backend is open
-            if (LookDev.open)
+            if (LookDev.open && LookDev.currentContext != null)
             {
                 //If EnvironmentLibrary asset as been edited by the user (deletion),
                 //update all view to use null environment if it was not temporary ones

Packages/com.unity.render-pipelines.core/Editor/LookDev/DisplayWindow.EnvironmentLibrarySidePanel.cs

@@ -13,6 +13,7 @@ class LookDevVolumeProfileSettingsPropertyDrawer : PropertyDrawer
     {
         VisualElement m_Root;
         Editor m_LookDevVolumeProfileEditor;
+        int m_LookDevVolumeProfileHash = -1;
         SerializedObject m_SettingsSerializedObject;
         SerializedProperty m_VolumeProfileSerializedProperty;
         EditorPrefBool m_DefaultVolumeProfileFoldoutExpanded;
@@ -51,6 +52,14 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
 
         Editor GetLookDevDefaultVolumeProfileEditor(VolumeProfile lookDevAsset)
         {
+            int currentHash = (lookDevAsset != null) ? lookDevAsset.GetHashCode() : -1;
+            if (currentHash != m_LookDevVolumeProfileHash)
+            {
+                Editor.DestroyImmediate(m_LookDevVolumeProfileEditor);
+                m_LookDevVolumeProfileEditor = null;
+                m_LookDevVolumeProfileHash = currentHash;
+            }
+
             Editor.CreateCachedEditor(lookDevAsset, typeof(VolumeProfileEditor), ref m_LookDevVolumeProfileEditor);
             return m_LookDevVolumeProfileEditor;
         }
@@ -68,8 +77,12 @@ VisualElement CreateAssetFieldUI()
             {
                 tooltip = k_LookDevVolumeProfileAssetLabel.tooltip,
                 objectType = typeof(VolumeProfile),
-                value = m_VolumeProfileSerializedProperty.objectReferenceValue as VolumeProfile,
+                style =
+                {
+                    flexShrink = 1,
+                }
             };
+            field.BindProperty(m_VolumeProfileSerializedProperty);
             field.AddToClassList("unity-base-field__aligned"); //Align with other BaseField<T>
             field.Q<Label>().RegisterCallback<ClickEvent>(evt => toggle.value ^= true);
 
@@ -91,37 +104,15 @@ VisualElement CreateAssetFieldUI()
                 if (evt.newValue == evt.previousValue)
                     return;
 
-                if (evt.newValue == null)
+                if (GraphicsSettings.TryGetRenderPipelineSettings<LookDevVolumeProfileSettings>(out var lookDevVolumeProfileSettings))
                 {
-                    if (evt.previousValue != null)
-                    {
-                        field.SetValueWithoutNotify(evt.previousValue);
-                        Debug.Log("This Volume Profile Asset cannot be null. Rolling back to previous value.");
-                        return;
-                    }
-                    else
-                    {
-                        if (RenderPipelineManager.currentPipeline is not HDRenderPipeline)
-                        {
-                            m_VolumeProfileSerializedProperty.objectReferenceValue = null;
-                        }
-                        else
-                        {
-                            var lookDevVolumeProfileSettings = GraphicsSettings.GetRenderPipelineSettings<LookDevVolumeProfileSettings>();
-                            if (lookDevVolumeProfileSettings.volumeProfile == null)
-                            {
-                                lookDevVolumeProfileSettings.volumeProfile = VolumeUtils.CopyVolumeProfileFromResourcesToAssets(
-                                    GraphicsSettings.GetRenderPipelineSettings<HDRenderPipelineEditorAssets>().lookDevVolumeProfile);
-                            }
-
-                            m_VolumeProfileSerializedProperty.objectReferenceValue = lookDevVolumeProfileSettings.volumeProfile;
-                        }
-                    }
+                    lookDevVolumeProfileSettings.volumeProfile = evt.newValue as VolumeProfile;
+                    m_VolumeProfileSerializedProperty.objectReferenceValue = lookDevVolumeProfileSettings.volumeProfile;
+                    m_VolumeProfileSerializedProperty.serializedObject.ApplyModifiedProperties();
+                    m_SettingsSerializedObject.Update();
                 }
-                else
-                    m_VolumeProfileSerializedProperty.objectReferenceValue = evt.newValue;
 
-                m_VolumeProfileSerializedProperty.serializedObject.ApplyModifiedProperties();
+                m_LookDevVolumeProfileHash = -1; // Invalidate the hash, to allow the IMGUI container recreate the editor
             });
 
             return profileLine;
@@ -154,6 +145,10 @@ VisualElement CreateVolumeProfileEditorUI()
                     if (lookDevAsset.Has<HDRISky>())
                         EditorGUILayout.HelpBox("HDRISky is not modifiable and will be overridden by the LookDev", MessageType.Warning);
                 }
+                else
+                {
+                    EditorGUILayout.HelpBox("No Look Dev Volume Profile assigned. A default profile will be created automatically when you open the Look Dev tool (Window > Rendering > Look Dev).", MessageType.Info);
+                }
             });
         }
     }