From 3c4292159a7df0e363712abe00cb4ba8da8df2ff Mon Sep 17 00:00:00 2001 From: yasirkula Date: Thu, 31 Aug 2023 07:10:51 +0300 Subject: [PATCH] Fixed deprecated EditorSceneManager warnings on 2022.2+ --- .../AssetUsageDetector/Editor/AssetUsageDetector.cs | 12 ++++++------ Plugins/AssetUsageDetector/Editor/SearchResult.cs | 7 ++++++- Plugins/AssetUsageDetector/Editor/Utilities.cs | 4 ++-- Plugins/AssetUsageDetector/README.txt | 2 +- package.json | 2 +- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs index aa7a107..8b5dd26 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs @@ -289,10 +289,10 @@ namespace AssetUsageDetectorNamespace 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 @@ namespace AssetUsageDetectorNamespace if( isInPlayMode ) { HashSet openScenes = new HashSet(); - 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 index e6df6c6..0099b42 100644 --- a/Plugins/AssetUsageDetector/Editor/SearchResult.cs +++ b/Plugins/AssetUsageDetector/Editor/SearchResult.cs @@ -803,7 +803,12 @@ namespace AssetUsageDetectorNamespace } } - 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 index fa8c0b3..f1c6661 100644 --- a/Plugins/AssetUsageDetector/Editor/Utilities.cs +++ b/Plugins/AssetUsageDetector/Editor/Utilities.cs @@ -416,9 +416,9 @@ namespace AssetUsageDetectorNamespace // 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 index 2ffb675..071e174 100644 --- 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 index d6752d7..1ef2042 100644 --- 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",