Fixed an issue with the package updater in unity 2020.x

Algoryx · Mar 11, 2024 · 4a5ff8c · 4a5ff8c
1 parent 1e8e37a
commit 4a5ff8c
Showing 1 changed file with 15 additions and 20 deletions.
diff --git a/Editor/AGXUnityEditor/PackageUpdateHandler.cs b/Editor/AGXUnityEditor/PackageUpdateHandler.cs
@@ -10,6 +10,7 @@
 using SceneManager = UnityEngine.SceneManagement.SceneManager;
 using Scene = UnityEngine.SceneManagement.Scene;
 using EditorSceneManager = UnityEditor.SceneManagement.EditorSceneManager;
+using UnityEditor.SceneManagement;
 
 namespace AGXUnityEditor
 {
@@ -66,32 +67,26 @@ public static bool Install( FileInfo packageFileInfo )
           EditorSceneManager.SaveScenes( unsavedScenes );
       }
 
-      EditorSceneManager.NewScene( UnityEditor.SceneManagement.NewSceneSetup.EmptyScene,
-                                   UnityEditor.SceneManagement.NewSceneMode.Single );
+      // Using EditorSceneManager.NewScene with the Single mode seems to not save the currently open scene in versions prior to 2021.3
+      // This causes the original scene to be loaded when the project is reopened which in turn causes the agx binaries to load if 
+      // there are any AGXUnity components in the scene. To avoid this issue a new scene can be created after which the loaded scenes are
+      // removed from the scene manager manually.
+#if UNITY_2021_3_OR_NEWER
+      EditorSceneManager.NewScene( NewSceneSetup.EmptyScene,
+                                   NewSceneMode.Single );
+#else
+      Scene newScene = EditorSceneManager.NewScene(NewSceneSetup.EmptyScene, NewSceneMode.Additive);
+
+      foreach ( var scene in Scenes )
+        if ( scene != newScene )
+          EditorSceneManager.CloseScene( scene, true );
+#endif
 
       Debug.Log( "Preparing native plugins before restart..." );
-#if UNITY_2019_1_OR_NEWER
       foreach ( var nativePlugin in NativePlugins ) {
         nativePlugin.isPreloaded = false;
         nativePlugin.SaveAndReimport();
       }
-#else
-      Debug.Log( $"Removing {IO.Utils.AGXUnityPluginDirectoryFull} from PATH ..." );
-      var notInPathOrRemovedFromPath = !AGXUnity.IO.Environment.IsInPath( IO.Utils.AGXUnityPluginDirectoryFull ) ||
-                                       AGXUnity.IO.Environment.RemoveFromPath( IO.Utils.AGXUnityPluginDirectoryFull );
-      if ( notInPathOrRemovedFromPath )
-        Debug.Log( "    ... success." );
-      else {
-        Debug.LogWarning( "    ...failed. This could cause plugins to be loaded post reload - leading to errors." );
-        return false;
-      }
-
-      foreach ( var nativePlugin in NativePlugins ) {
-        nativePlugin.SetCompatibleWithEditor( false );
-        nativePlugin.SetCompatibleWithAnyPlatform( false );
-        nativePlugin.SaveAndReimport();
-      }
-#endif
 
       Debug.Log( "Preparing AGX Dynamics for Unity before restart..." );
       Build.DefineSymbols.Add( Build.DefineSymbols.ON_AGXUNITY_UPDATE );