Fixed method ReloadBaseTypes being called 2 times when entering play …

…mode. The same thing occurs with EditorUtilities.ReloadDecoratorTypes, but the fix cannot be applied in this context.
Unity-Technologies · Sep 6, 2019 · 7cba7a0 · 7cba7a0
1 parent a5fe3f1
commit 7cba7a0
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/PostProcessing/Runtime/PostProcessManager.cs b/PostProcessing/Runtime/PostProcessManager.cs
@@ -59,7 +59,11 @@ public static PostProcessManager instance
         [UnityEditor.Callbacks.DidReloadScripts]
         static void OnEditorReload()
         {
-            instance.ReloadBaseTypes();
+            // ctor() will also call ReloadBaseTypes. This "dirty" test will avoid 2 calls of ReloadBaseTypes
+            if (s_Instance == null)
+                s_Instance = new PostProcessManager();
+            else
+                s_Instance.ReloadBaseTypes();
         }
 #endif