Not disposing APV stuff when the Lighting window closes and a bake is running

belgaard · Evergreen · commit 6067db0cfb66 · 2024-06-28T13:09:30.000Z
The purpose of this PR is to avoid a memory leak and null pointer references when the Lighting window closes while APV is baking
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeVolumeLightingTab.cs b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeVolumeLightingTab.cs
@@ -206,7 +206,10 @@ public override void OnDisable()
 
             EditorSceneManager.sceneOpened -= OnSceneOpened;
 
-            AdaptiveProbeVolumes.Dispose();
+            // We keep allocated acceleration structures while the Lighting window is open in order to make subsequent bakes faster, but when the window closes we dispose of them
+            // Unless a bake is running, in which case we leave disposing to CleanBakeData() 
+            if (!AdaptiveProbeVolumes.isRunning && !Lightmapping.isRunning)
+                AdaptiveProbeVolumes.Dispose();
         }
 
         #region On GUI

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,10 @@ public override void OnDisable()`
`206`	`206`
`207`	`207`	`EditorSceneManager.sceneOpened -= OnSceneOpened;`
`208`	`208`
`209`		`- AdaptiveProbeVolumes.Dispose();`
	`209`	`+ // We keep allocated acceleration structures while the Lighting window is open in order to make subsequent bakes faster, but when the window closes we dispose of them`
	`210`	`+ // Unless a bake is running, in which case we leave disposing to CleanBakeData()`
	`211`	`+ if (!AdaptiveProbeVolumes.isRunning && !Lightmapping.isRunning)`
	`212`	`+ AdaptiveProbeVolumes.Dispose();`
`210`	`213`	`}`
`211`	`214`
`212`	`215`	`#region On GUI`