Fixed deprecated EditorSceneManager warnings on 2022.2+

yasirkula · yasirkula · commit 3c4292159a7d · 2023-08-31T07:10:51.000+03:00
diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs
@@ -289,10 +289,10 @@ public SearchResult Run( Parameters searchParameters )
 					if( ( searchParameters.searchInScenes & SceneSearchMode.OpenScenes ) == SceneSearchMode.OpenScenes )
 					{
 						// Get all open (and loaded) scenes
-						for( int i = 0; i < EditorSceneManager.loadedSceneCount; i++ )
+						for( int i = 0; i < SceneManager.sceneCount; i++ )
 						{
-							Scene scene = EditorSceneManager.GetSceneAt( i );
-							if( scene.IsValid() )
+							Scene scene = SceneManager.GetSceneAt( i );
+							if( scene.IsValid() && scene.isLoaded )
 								scenesToSearch.Add( scene.path );
 						}
 					}
@@ -314,10 +314,10 @@ public SearchResult Run( Parameters searchParameters )
 				if( isInPlayMode )
 				{
 					HashSet<string> openScenes = new HashSet<string>();
-					for( int i = 0; i < EditorSceneManager.loadedSceneCount; i++ )
+					for( int i = 0; i < SceneManager.sceneCount; i++ )
 					{
-						Scene scene = EditorSceneManager.GetSceneAt( i );
-						if( scene.IsValid() )
+						Scene scene = SceneManager.GetSceneAt( i );
+						if( scene.IsValid() && scene.isLoaded )
 							openScenes.Add( scene.path );
 					}
 
diff --git a/Plugins/AssetUsageDetector/Editor/SearchResult.cs b/Plugins/AssetUsageDetector/Editor/SearchResult.cs
@@ -803,7 +803,12 @@ public float DrawOnGUI( SearchResult searchResult, EditorWindow window, float sc
 						}
 					}
 
-					if( Type == GroupType.Scene && !EditorApplication.isPlaying && EditorSceneManager.loadedSceneCount > 1 )
+#if UNITY_2022_2_OR_NEWER
+					int loadedSceneCount = SceneManager.loadedSceneCount;
+#else
+					int loadedSceneCount = EditorSceneManager.loadedSceneCount;
+#endif
+					if( Type == GroupType.Scene && !EditorApplication.isPlaying && loadedSceneCount > 1 )
 					{
 						// Show context menu when SearchResultGroup's header is right clicked
 						Scene scene = EditorSceneManager.GetSceneByPath( ScenePath );
diff --git a/Plugins/AssetUsageDetector/Editor/Utilities.cs b/Plugins/AssetUsageDetector/Editor/Utilities.cs
@@ -416,9 +416,9 @@ public static VariableGetVal CreateGetter( this PropertyInfo propertyInfo )
 		// Check if all open scenes are saved (not dirty)
 		public static bool AreScenesSaved()
 		{
-			for( int i = 0; i < EditorSceneManager.loadedSceneCount; i++ )
+			for( int i = 0; i < SceneManager.sceneCount; i++ )
 			{
-				Scene scene = EditorSceneManager.GetSceneAt( i );
+				Scene scene = SceneManager.GetSceneAt( i );
 				if( scene.isDirty || string.IsNullOrEmpty( scene.path ) )
 					return false;
 			}
diff --git a/Plugins/AssetUsageDetector/README.txt b/Plugins/AssetUsageDetector/README.txt
@@ -1,4 +1,4 @@
-= Asset Usage Detector (v2.4.1) =
+= Asset Usage Detector (v2.4.2) =
 
 Online documentation available at: https://github.com/yasirkula/UnityAssetUsageDetector
 E-mail: yasirkula@gmail.com
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.yasirkula.assetusagedetector",
   "displayName": "Asset Usage Detector",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "documentationUrl": "https://github.com/yasirkula/UnityAssetUsageDetector",
   "changelogUrl": "https://github.com/yasirkula/UnityAssetUsageDetector/releases",
   "licensesUrl": "https://github.com/yasirkula/UnityAssetUsageDetector/blob/master/LICENSE.txt",

Original file line number	Diff line number	Diff line change
`@@ -289,10 +289,10 @@ public SearchResult Run( Parameters searchParameters )`
`289`	`289`	`if( ( searchParameters.searchInScenes & SceneSearchMode.OpenScenes ) == SceneSearchMode.OpenScenes )`
`290`	`290`	`{`
`291`	`291`	`// Get all open (and loaded) scenes`
`292`		`- for( int i = 0; i < EditorSceneManager.loadedSceneCount; i++ )`
	`292`	`+ for( int i = 0; i < SceneManager.sceneCount; i++ )`
`293`	`293`	`{`
`294`		`- Scene scene = EditorSceneManager.GetSceneAt( i );`
`295`		`- if( scene.IsValid() )`
	`294`	`+ Scene scene = SceneManager.GetSceneAt( i );`
	`295`	`+ if( scene.IsValid() && scene.isLoaded )`
`296`	`296`	`scenesToSearch.Add( scene.path );`
`297`	`297`	`}`
`298`	`298`	`}`
`@@ -314,10 +314,10 @@ public SearchResult Run( Parameters searchParameters )`
`314`	`314`	`if( isInPlayMode )`
`315`	`315`	`{`
`316`	`316`	`HashSet<string> openScenes = new HashSet<string>();`
`317`		`- for( int i = 0; i < EditorSceneManager.loadedSceneCount; i++ )`
	`317`	`+ for( int i = 0; i < SceneManager.sceneCount; i++ )`
`318`	`318`	`{`
`319`		`- Scene scene = EditorSceneManager.GetSceneAt( i );`
`320`		`- if( scene.IsValid() )`
	`319`	`+ Scene scene = SceneManager.GetSceneAt( i );`
	`320`	`+ if( scene.IsValid() && scene.isLoaded )`
`321`	`321`	`openScenes.Add( scene.path );`
`322`	`322`	`}`
`323`	`323`
Original file line number	Diff line number	Diff line change
`@@ -803,7 +803,12 @@ public float DrawOnGUI( SearchResult searchResult, EditorWindow window, float sc`
`803`	`803`	`}`
`804`	`804`	`}`
`805`	`805`
`806`		`- if( Type == GroupType.Scene && !EditorApplication.isPlaying && EditorSceneManager.loadedSceneCount > 1 )`
	`806`	`+#if UNITY_2022_2_OR_NEWER`
	`807`	`+ int loadedSceneCount = SceneManager.loadedSceneCount;`
	`808`	`+#else`
	`809`	`+ int loadedSceneCount = EditorSceneManager.loadedSceneCount;`
	`810`	`+#endif`
	`811`	`+ if( Type == GroupType.Scene && !EditorApplication.isPlaying && loadedSceneCount > 1 )`
`807`	`812`	`{`
`808`	`813`	`// Show context menu when SearchResultGroup's header is right clicked`
`809`	`814`	`Scene scene = EditorSceneManager.GetSceneByPath( ScenePath );`
Original file line number	Diff line number	Diff line change
`@@ -416,9 +416,9 @@ public static VariableGetVal CreateGetter( this PropertyInfo propertyInfo )`
`416`	`416`	`// Check if all open scenes are saved (not dirty)`
`417`	`417`	`public static bool AreScenesSaved()`
`418`	`418`	`{`
`419`		`- for( int i = 0; i < EditorSceneManager.loadedSceneCount; i++ )`
	`419`	`+ for( int i = 0; i < SceneManager.sceneCount; i++ )`
`420`	`420`	`{`
`421`		`- Scene scene = EditorSceneManager.GetSceneAt( i );`
	`421`	`+ Scene scene = SceneManager.GetSceneAt( i );`
`422`	`422`	`if( scene.isDirty \|\| string.IsNullOrEmpty( scene.path ) )`
`423`	`423`	`return false;`
`424`	`424`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-= Asset Usage Detector (v2.4.1) =`
	`1`	`+= Asset Usage Detector (v2.4.2) =`
`2`	`2`
`3`	`3`	`Online documentation available at: https://github.com/yasirkula/UnityAssetUsageDetector`
`4`	`4`	`E-mail: yasirkula@gmail.com`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "com.yasirkula.assetusagedetector",`
`3`	`3`	`"displayName": "Asset Usage Detector",`
`4`		`- "version": "2.4.1",`
	`4`	`+ "version": "2.4.2",`
`5`	`5`	`"documentationUrl": "https://github.com/yasirkula/UnityAssetUsageDetector",`
`6`	`6`	`"changelogUrl": "https://github.com/yasirkula/UnityAssetUsageDetector/releases",`
`7`	`7`	`"licensesUrl": "https://github.com/yasirkula/UnityAssetUsageDetector/blob/master/LICENSE.txt",`