From 17d3b33e8e0567e4877cfb2fd004795d4a2073f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=BCleyman=20Yasir=20KULA?= Date: Sat, 8 Feb 2020 23:54:48 +0300 Subject: [PATCH] References from one sub-asset to the other were skipped when "Don't search 'Find references of' themselves for references" was enabled (e.g. a reference from a prefab's child A to child B was skipped while searching for B's references), now fixed. --- .../Editor/AssetUsageDetector.cs | 16 +++-- .../Editor/AssetUsageDetectorWindow.cs | 68 +++++++++++++------ 2 files changed, 59 insertions(+), 25 deletions(-) diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs index f3d8390..fe7896d 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs @@ -121,6 +121,8 @@ namespace AssetUsageDetectorNamespace private readonly HashSet assetsToSearchPathsSet = new HashSet(); // The root prefab objects in assetsToSearch that will be used to search for prefab references private readonly List assetsToSearchRootPrefabs = new List( 4 ); + // Path(s) of the assets that should be excluded from the search + private readonly HashSet excludedAssetsPathsSet = new HashSet(); // Results for the currently searched scene private SearchResultGroup currentSearchResultGroup; @@ -155,6 +157,7 @@ namespace AssetUsageDetectorNamespace private Object currentSearchedObject; private int currentDepth; + private bool dontSearchInSourceAssets; private bool searchingSourceAssets; private bool isInPlayMode; @@ -238,6 +241,7 @@ namespace AssetUsageDetectorNamespace this.propertyModifiers = searchParameters.propertyModifiers | BindingFlags.Instance | BindingFlags.DeclaredOnly; this.searchDepthLimit = searchParameters.searchDepthLimit; this.searchSerializableVariablesOnly = !searchParameters.searchNonSerializableVariables; + this.dontSearchInSourceAssets = searchParameters.dontSearchInSourceAssets; // Initialize commonly used variables searchResult = new List(); // Overall search results @@ -254,6 +258,7 @@ namespace AssetUsageDetectorNamespace assetsToSearchSet.Clear(); assetsToSearchPathsSet.Clear(); assetsToSearchRootPrefabs.Clear(); + excludedAssetsPathsSet.Clear(); if( assetDependencyCache == null ) { @@ -485,7 +490,6 @@ namespace AssetUsageDetectorNamespace } // Calculate the path(s) of the assets that won't be searched for references - HashSet excludedAssetsPathsSet = new HashSet(); if( searchParameters.excludedAssetsFromSearch != null ) { foreach( Object obj in searchParameters.excludedAssetsFromSearch ) @@ -503,9 +507,6 @@ namespace AssetUsageDetectorNamespace } } - if( searchParameters.dontSearchInSourceAssets ) - excludedAssetsPathsSet.UnionWith( assetsToSearchPathsSet ); - if( EditorUtility.DisplayCancelableProgressBar( "Please wait...", "Searching assets", 0f ) ) throw new Exception( "Search aborted" ); @@ -608,7 +609,7 @@ namespace AssetUsageDetectorNamespace } // Searching source assets last prevents some references from being excluded due to callStack.ContainsFast - if( !searchParameters.dontSearchInSourceAssets ) + if( !dontSearchInSourceAssets ) { searchingSourceAssets = true; @@ -728,7 +729,11 @@ namespace AssetUsageDetectorNamespace string assetPath = AssetDatabase.GetAssetPath( obj ); if( !string.IsNullOrEmpty( assetPath ) ) + { assetsToSearchPathsSet.Add( assetPath ); + if( dontSearchInSourceAssets && AssetDatabase.IsMainAsset( obj ) ) + excludedAssetsPathsSet.Add( assetPath ); + } GameObject go = null; if( obj is GameObject ) @@ -743,7 +748,6 @@ namespace AssetUsageDetectorNamespace for( int i = assetsToSearchRootPrefabs.Count - 1; i >= 0; i-- ) { Transform rootTransform = assetsToSearchRootPrefabs[i].transform; - if( transform.IsChildOf( rootTransform ) ) { shouldAddRootPrefabEntry = false; diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs index 4d5961a..e0cfeb8 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs @@ -194,6 +194,18 @@ namespace AssetUsageDetectorNamespace.Extras private void OnEnable() { visibleWindow = this; + +#if UNITY_2018_3_OR_NEWER + UnityEditor.Experimental.SceneManagement.PrefabStage.prefabStageClosing -= ReplacePrefabStageObjectsWithAssets; + UnityEditor.Experimental.SceneManagement.PrefabStage.prefabStageClosing += ReplacePrefabStageObjectsWithAssets; +#endif + } + + private void OnDisable() + { +#if UNITY_2018_3_OR_NEWER + UnityEditor.Experimental.SceneManagement.PrefabStage.prefabStageClosing -= ReplacePrefabStageObjectsWithAssets; +#endif } private void OnDestroy() @@ -565,25 +577,7 @@ namespace AssetUsageDetectorNamespace.Extras SavePrefs(); #if UNITY_2018_3_OR_NEWER - // Try replacing prefab stage objects with their corresponding prefab assets - var openPrefabStage = UnityEditor.Experimental.SceneManagement.PrefabStageUtility.GetCurrentPrefabStage(); - if( openPrefabStage != null && openPrefabStage.stageHandle.IsValid() ) - { - GameObject openPrefabStagePrefabAsset = AssetDatabase.LoadAssetAtPath( openPrefabStage.prefabAssetPath ); - if( openPrefabStagePrefabAsset != null ) - { - for( int i = 0; i < objectsToSearch.Count; i++ ) - { - if( objectsToSearch[i].obj != null && !objectsToSearch[i].obj.Equals( null ) && - objectsToSearch[i].obj is GameObject && openPrefabStage.IsPartOfPrefabContents( (GameObject) objectsToSearch[i].obj ) ) - { - GameObject prefabStageObjectSource = ( (GameObject) objectsToSearch[i].obj ).FollowSymmetricHierarchy( openPrefabStagePrefabAsset ); - if( prefabStageObjectSource != null ) - objectsToSearch[i].obj = prefabStageObjectSource; - } - } - } - } + ReplacePrefabStageObjectsWithAssets( UnityEditor.Experimental.SceneManagement.PrefabStageUtility.GetCurrentPrefabStage() ); #endif // Start searching @@ -609,6 +603,42 @@ namespace AssetUsageDetectorNamespace.Extras } } +#if UNITY_2018_3_OR_NEWER + // Try replacing searched objects who are part of currently open prefab stage with their corresponding prefab assets + public void ReplacePrefabStageObjectsWithAssets( UnityEditor.Experimental.SceneManagement.PrefabStage prefabStage ) + { + if( prefabStage == null || !prefabStage.stageHandle.IsValid() ) + return; + + GameObject prefabAsset = AssetDatabase.LoadAssetAtPath( prefabStage.prefabAssetPath ); + if( prefabAsset == null ) + return; + + for( int i = 0; i < objectsToSearch.Count; i++ ) + { + Object obj = objectsToSearch[i].obj; + if( obj != null && !obj.Equals( null ) && obj is GameObject && prefabStage.IsPartOfPrefabContents( (GameObject) obj ) ) + { + GameObject prefabStageObjectSource = ( (GameObject) obj ).FollowSymmetricHierarchy( prefabAsset ); + if( prefabStageObjectSource != null ) + objectsToSearch[i].obj = prefabStageObjectSource; + + List subAssets = objectsToSearch[i].subAssets; + for( int j = 0; j < subAssets.Count; j++ ) + { + obj = subAssets[j].subAsset; + if( obj != null && !obj.Equals( null ) && obj is GameObject && prefabStage.IsPartOfPrefabContents( (GameObject) obj ) ) + { + prefabStageObjectSource = ( (GameObject) obj ).FollowSymmetricHierarchy( prefabAsset ); + if( prefabStageObjectSource != null ) + subAssets[j].subAsset = prefabStageObjectSource; + } + } + } + } + } +#endif + private bool ReturnToSetupPhase( bool restoreInitialSceneSetup ) { if( searchResult != null && restoreInitialSceneSetup && !EditorApplication.isPlaying && !searchResult.RestoreInitialSceneSetup() )