Fix compil issue with Enable BakeCookie

Unity-Technologies · Apr 17, 2020 · 6cdf38e · 6cdf38e
1 parent 6118301
commit 6cdf38e
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs
@@ -103,7 +103,7 @@ internal static Volume GetOrCreateDefaultVolume()
         readonly XRSystem m_XRSystem;
 
         bool m_FrameSettingsHistoryEnabled = false;
-        bool m_DisableCookieForLightBaking = false;
+        bool m_PreviousDisableCookieForLightBaking = false;
 
         /// <summary>
         /// This functions allows the user to have an approximation of the number of rays that were traced for a given frame.
@@ -672,9 +672,6 @@ void SetRenderingFeatures()
             GraphicsSettings.lightsUseLinearIntensity = true;
             GraphicsSettings.lightsUseColorTemperature = true;
 
-            m_DisableCookieForLightBaking = UnityEditor.EditorSettings.disableCookiesInLightmapper;
-            UnityEditor.EditorSettings.disableCookiesInLightmapper = false;
-
             GraphicsSettings.useScriptableRenderPipelineBatching = m_Asset.enableSRPBatcher;
 
             SupportedRenderingFeatures.active = new SupportedRenderingFeatures()
@@ -702,6 +699,10 @@ void SetRenderingFeatures()
             Lightmapping.SetDelegate(GlobalIlluminationUtils.hdLightsDelegate);
 
 #if UNITY_EDITOR
+            // HDRP always enable baking of cookie by default
+            m_PreviousDisableCookieForLightBaking = UnityEditor.EditorSettings.disableCookiesInLightmapper;
+            UnityEditor.EditorSettings.disableCookiesInLightmapper = false;
+
             SceneViewDrawMode.SetupDrawMode();
 
             if (UnityEditor.PlayerSettings.colorSpace == ColorSpace.Gamma)
@@ -791,9 +792,11 @@ void UnsetRenderingFeatures()
             // Reset srp batcher state just in case
             GraphicsSettings.useScriptableRenderPipelineBatching = false;
 
-            UnityEditor.EditorSettings.disableCookiesInLightmapper = m_DisableCookieForLightBaking;
-
             Lightmapping.ResetDelegate();
+
+#if UNITY_EDITOR
+            UnityEditor.EditorSettings.disableCookiesInLightmapper = m_PreviousDisableCookieForLightBaking;
+#endif
         }
 
         void InitializeDebugMaterials()