Fixed method ReloadBaseTypes being called 2 times when entering play mode.

PierreGac · Pierre GAC · commit 7cba7a03558f · 2019-09-06T10:01:55.000+02:00
The same thing occurs with EditorUtilities.ReloadDecoratorTypes, but the fix cannot be applied in this context.
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
 

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,11 @@ public static PostProcessManager instance`
`59`	`59`	`[UnityEditor.Callbacks.DidReloadScripts]`
`60`	`60`	`static void OnEditorReload()`
`61`	`61`	`{`
`62`		`- instance.ReloadBaseTypes();`
	`62`	`+ // ctor() will also call ReloadBaseTypes. This "dirty" test will avoid 2 calls of ReloadBaseTypes`
	`63`	`+ if (s_Instance == null)`
	`64`	`+ s_Instance = new PostProcessManager();`
	`65`	`+ else`
	`66`	`+ s_Instance.ReloadBaseTypes();`
`63`	`67`	`}`
`64`	`68`	`#endif`
`65`	`69`