Fixed an issue where a warning about the static sky not being ready w…

…as wrongly displayed. #2727
Unity-Technologies · Nov 24, 2020 · 9839416 · 9839416
1 parent 02a8679
commit 9839416
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md
@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed missing alpha blend state properties in Axf shader and update default stencil properties
 - Fixed normal buffer not bound to custom pass anymore.
 - Fixed issues with camera management in the graphics compositor (cases 1292548, 1292549).
+- Fixed an issue where a warning about the static sky not being ready was wrongly displayed.
 
 ### Changed
 - Removed the material pass probe volumes evaluation mode.

diff --git a/com.unity.render-pipelines.high-definition/Runtime/Sky/SkyManager.cs b/com.unity.render-pipelines.high-definition/Runtime/Sky/SkyManager.cs
@@ -153,20 +153,12 @@ class SkyManager
 
         // 2 by default: Static sky + one dynamic. Will grow if needed.
         DynamicArray<CachedSkyContext> m_CachedSkyContexts = new DynamicArray<CachedSkyContext>(2);
+
+        public SkyManager()	
+        {}	
 
-        public SkyManager()
-        {
-#if UNITY_EDITOR
-            UnityEditor.Lightmapping.bakeStarted += OnBakeStarted;
-    #endif
-        }
-
-        ~SkyManager()
-        {
-#if UNITY_EDITOR
-            UnityEditor.Lightmapping.bakeStarted -= OnBakeStarted;
-#endif
-        }
+        ~SkyManager()	
+        {}        
 
         internal static SkySettings GetSkySetting(VolumeStack stack)
         {
@@ -293,6 +285,10 @@ public void Build(HDRenderPipelineAsset hdAsset, RenderPipelineResources default
             }
 
             InitializeBlackCubemapArray();
+
+#if UNITY_EDITOR
+            UnityEditor.Lightmapping.bakeStarted += OnBakeStarted;
+#endif
         }
 
         void InitializeBlackCubemapArray()
@@ -339,6 +335,7 @@ public void Cleanup()
 
 #if UNITY_EDITOR
             CoreUtils.Destroy(m_DefaultPreviewSky);
+            UnityEditor.Lightmapping.bakeStarted -= OnBakeStarted;
 #endif
         }