[HDRP][LookDev] Ensure stylesheet are loaded before applying them on Domain Reload (#1985)

Author: jenniferd-unity

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

@@ -216,24 +216,48 @@ event Action IViewDisplayer.OnUpdateRequested
         StyleSheet styleSheet = null;
         StyleSheet styleSheetLight = null;
 
-        void OnEnable()
+        void ReloadStyleSheets()
         {
-            //Stylesheet
-            // Try to load stylesheet. Timing can be odd while upgrading packages (case 1219692).
-            // In this case, it will be fixed in OnGUI. Though it can spawn error while reimporting assets.
-            // Waiting for filter on stylesheet (case 1228706) to remove last error.
-            if (styleSheet == null || styleSheet.Equals(null))
+            if(styleSheet == null || styleSheet.Equals(null))
             {
                 styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>(Style.k_uss);
-                if (styleSheet != null && !styleSheet.Equals(null))
-                    rootVisualElement.styleSheets.Add(styleSheet);
+                if(styleSheet == null || styleSheet.Equals(null))
+                {
+                    //Debug.LogWarning("[LookDev] Could not load Stylesheet.");
+                    return;
+                }
             }
-            if (!EditorGUIUtility.isProSkin && styleSheetLight != null && !styleSheetLight.Equals(null))
+
+            if(!rootVisualElement.styleSheets.Contains(styleSheet))
+                rootVisualElement.styleSheets.Add(styleSheet);
+
+            //Additively load Light Skin
+            if(!EditorGUIUtility.isProSkin)
             {
-                styleSheetLight = AssetDatabase.LoadAssetAtPath<StyleSheet>(Style.k_uss_personal_overload);
-                if (styleSheetLight != null && !styleSheetLight.Equals(null))
+                if(styleSheetLight == null || styleSheetLight.Equals(null))
+                {
+                    styleSheetLight = AssetDatabase.LoadAssetAtPath<StyleSheet>(Style.k_uss_personal_overload);
+                    if(styleSheetLight == null || styleSheetLight.Equals(null))
+                    {
+                        //Debug.LogWarning("[LookDev] Could not load Light skin.");
+                        return;
+                    }
+                }
+                 
+                if(!rootVisualElement.styleSheets.Contains(styleSheetLight))
                     rootVisualElement.styleSheets.Add(styleSheetLight);
             }
+        }
+
+        void OnEnable()
+        {
+            //Stylesheet
+            // Try to load stylesheet. Timing can be odd while upgrading packages (case 1219692).
+            // In this case, it will be fixed in OnGUI. Though it can spawn error while reimporting assets.
+            // Waiting for filter on stylesheet (case 1228706) to remove last error.
+            // On Editor Skin change, OnEnable is called and stylesheets need to be reloaded (case 1278802).
+            if(EditorApplication.isUpdating)
+                ReloadStyleSheets();
 
             //Call the open function to configure LookDev
             // in case the window where open when last editor session finished.
@@ -681,14 +705,11 @@ void OnGUI()
                 //        rootVisualElement.styleSheets.Add(styleSheetLight);
                 //}
             }
-            else
-            {
-                //deal with missing style when domain reload...
-                if (!rootVisualElement.styleSheets.Contains(styleSheet))
-                    rootVisualElement.styleSheets.Add(styleSheet);
-                if (!EditorGUIUtility.isProSkin && !rootVisualElement.styleSheets.Contains(styleSheetLight))
-                    rootVisualElement.styleSheets.Add(styleSheetLight);
-            }
+            if(EditorApplication.isUpdating)
+                return;
+           
+            //deal with missing style on domain reload...
+            ReloadStyleSheets();
 
             // [case 1245086] Guard in case the SRP asset is set to null (or to a not supported SRP) when the lookdev window is already open
             // Note: After an editor reload, we might get a null OnUpdateRequestedInternal and null SRP for a couple of frames, hence the check.

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

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed issue with volume manager trying to access a null volume.
 - Fixed an issue that caused a null reference when deleting camera component in a prefab. (case 1244430)
 - Fixed nan in pbr sky
+- Fixed Light skin not properly applied on the LookDev when switching from Dark Skin (case 1278802)
 
 ## [7.5.1] - 2020-09-02