From 26d40ee945763bcbed21b8db849c6c692dee6b2c Mon Sep 17 00:00:00 2001
From: FrancescoC-Unity <francescoc@unity3d.com>
Date: Thu, 16 Sep 2021 12:43:31 +0200
Subject: [PATCH 1/3] Move cleanup to cleanup and not destructor.

---
 .../Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs
index 166ea39d3eb..abd13e6cf1f 100644
--- a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs
+++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs
@@ -35,7 +35,7 @@ private AdditionalGIBakeRequestsManager()
             SubscribeOnBakeStarted();
         }
 
-        ~AdditionalGIBakeRequestsManager()
+        internal void Cleanup()
         {
             UnsubscribeOnBakeStarted();
         }
@@ -661,6 +661,8 @@ public void Cleanup()
         {
             if (!m_ProbeReferenceVolumeInit) return;
 
+            AdditionalGIBakeRequestsManager.instance.Cleanup();
+
             if (!m_IsInitialized)
             {
                 Debug.LogError("Probe Volume System has not been initialized first before calling cleanup.");

From 7c2425b7d5b72e4560935fcda574896837aeeb51 Mon Sep 17 00:00:00 2001
From: FrancescoC-Unity <francescoc@unity3d.com>
Date: Thu, 16 Sep 2021 13:33:18 +0200
Subject: [PATCH 2/3] Init too

---
 .../Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs
index abd13e6cf1f..4ec0e0cdbb7 100644
--- a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs
+++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs
@@ -30,7 +30,7 @@ public class AdditionalGIBakeRequestsManager
         /// </summary>
         public static AdditionalGIBakeRequestsManager instance { get { return s_Instance; } }
 
-        private AdditionalGIBakeRequestsManager()
+        internal void Init()
         {
             SubscribeOnBakeStarted();
         }
@@ -632,6 +632,8 @@ public void Initialize(in ProbeVolumeSystemParameters parameters)
             }
 #endif
             m_EnabledBySRP = true;
+
+            AdditionalGIBakeRequestsManager.instance.Init();
         }
 
         /// <summary>

From beec11f5b71abc7832167961997702e4bc5f29ca Mon Sep 17 00:00:00 2001
From: FrancescoC-Unity <francescoc@unity3d.com>
Date: Thu, 16 Sep 2021 16:30:43 +0200
Subject: [PATCH 3/3] Use right guards.

---
 .../Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs
index 4ec0e0cdbb7..50672ec2124 100644
--- a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs
+++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs
@@ -630,10 +630,9 @@ public void Initialize(in ProbeVolumeSystemParameters parameters)
             {
                 UnityEditor.SceneManagement.EditorSceneManager.sceneSaved += sceneData.OnSceneSaved;
             }
+            AdditionalGIBakeRequestsManager.instance.Init();
 #endif
             m_EnabledBySRP = true;
-
-            AdditionalGIBakeRequestsManager.instance.Init();
         }
 
         /// <summary>
@@ -663,7 +662,9 @@ public void Cleanup()
         {
             if (!m_ProbeReferenceVolumeInit) return;
 
+#if UNITY_EDITOR
             AdditionalGIBakeRequestsManager.instance.Cleanup();
+#endif
 
             if (!m_IsInitialized)
             {