Skip to content

Trying to fix an error stemming from calling SetAdditionalBakedProbes from the wrong thread. #5690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 16, 2021
Merged

Trying to fix an error stemming from calling SetAdditionalBakedProbes from the wrong thread. #5690

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
26d40ee
Move cleanup to cleanup and not destructor.
FrancescoC-unity Sep 16, 2021
7c2425b
Init too
FrancescoC-unity Sep 16, 2021
beec11f
Use right guards.
FrancescoC-unity Sep 16, 2021
c5ca712
Merge branch 'master' into HDRP/tentative-fix-for-calling-set-additio…
FrancescoC-unity Sep 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ public class AdditionalGIBakeRequestsManager
/// </summary>
public static AdditionalGIBakeRequestsManager instance { get { return s_Instance; } }

private AdditionalGIBakeRequestsManager()
internal void Init()
{
SubscribeOnBakeStarted();
}

~AdditionalGIBakeRequestsManager()
internal void Cleanup()
{
UnsubscribeOnBakeStarted();
}
Expand Down Expand Up @@ -630,6 +630,7 @@ public void Initialize(in ProbeVolumeSystemParameters parameters)
{
UnityEditor.SceneManagement.EditorSceneManager.sceneSaved += sceneData.OnSceneSaved;
}
AdditionalGIBakeRequestsManager.instance.Init();
#endif
m_EnabledBySRP = true;
}
Expand Down Expand Up @@ -661,6 +662,10 @@ public void Cleanup()
{
if (!m_ProbeReferenceVolumeInit) return;

#if UNITY_EDITOR
AdditionalGIBakeRequestsManager.instance.Cleanup();
#endif

if (!m_IsInitialized)
{
Debug.LogError("Probe Volume System has not been initialized first before calling cleanup.");
Expand Down