From f4129574fb7a5bcb3c1e3b2da353a44ea762ee2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=BCleyman=20Yasir=20KULA?= Date: Thu, 1 Oct 2020 13:43:23 +0300 Subject: [PATCH] - Custom meshes used in ParticleSystem's Renderer module weren't included in the search, fixed - Fix an exception that occurred when searching an Assembly Definition File's references if one of its References was missing --- .../Editor/AssetUsageDetector.cs | 7 ++--- .../AssetUsageDetectorSearchFunctions.cs | 27 +++++++++++++------ package.json | 2 +- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs index 1f3c6ed..aad9e57 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs @@ -548,7 +548,7 @@ namespace AssetUsageDetectorNamespace catch( Exception e ) { StringBuilder sb = new StringBuilder( objectsToSearchSet.Count * 50 + callStack.Count * 50 + 500 ); - sb.AppendLine( "AssetUsageDetector Error:" ).AppendLine(); + sb.AppendLine( "AssetUsageDetector Error:" ).AppendLine().Append( e ).AppendLine(); if( callStack.Count > 0 ) { sb.AppendLine( "Stack contents: " ); @@ -575,9 +575,6 @@ namespace AssetUsageDetectorNamespace sb.Append( obj.name ).Append( " (" ).Append( obj.GetType() ).AppendLine( ")" ); } - sb.AppendLine(); - sb.Append( e ).AppendLine(); - Debug.LogError( sb.ToString() ); try @@ -619,7 +616,7 @@ namespace AssetUsageDetectorNamespace if( shouldOpenPrefabStageWithoutContext ) #endif - AssetDatabase.OpenAsset( AssetDatabase.LoadAssetAtPath( openPrefabStageAssetPath ) ); + AssetDatabase.OpenAsset( AssetDatabase.LoadAssetAtPath( openPrefabStageAssetPath ) ); } #endif } diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs index 2020670..034ec3d 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs @@ -382,6 +382,14 @@ namespace AssetUsageDetectorNamespace if( objectsToSearchSet.Contains( script ) ) referenceNode.AddLinkTo( GetReferenceNode( script ) ); } + else if( component is ParticleSystemRenderer ) + { + // Search ParticleSystemRenderer's custom meshes for references (they aren't searched by SerializedObject, unfortunately) + Mesh[] meshes = new Mesh[( (ParticleSystemRenderer) component ).meshCount]; + int meshCount = ( (ParticleSystemRenderer) component ).GetMeshes( meshes ); + for( int i = 0; i < meshCount; i++ ) + referenceNode.AddLinkTo( SearchObject( meshes[i] ), "Custom particle mesh" ); + } else if( searchRenderers && component is Renderer ) { // If an asset is a shader, texture or material, and this component is a Renderer, @@ -392,7 +400,7 @@ namespace AssetUsageDetectorNamespace } else if( component is Animation ) { - // If this component is an Animation, search its animation clips for references + // Search animation clips for references foreach( AnimationState anim in (Animation) component ) referenceNode.AddLinkTo( SearchObject( anim.clip ) ); @@ -401,7 +409,7 @@ namespace AssetUsageDetectorNamespace } else if( component is Animator ) { - // If this component is an Animator, search its animation clips for references (via AnimatorController) + // Search animation clips for references (via AnimatorController) referenceNode.AddLinkTo( SearchObject( ( (Animator) component ).runtimeAnimatorController ) ); // Search the objects that are animated by this Animator component for references @@ -410,7 +418,7 @@ namespace AssetUsageDetectorNamespace #if UNITY_2017_2_OR_NEWER else if( component is Tilemap ) { - // If this component is a Tilemap, search its tiles for references + // Search the tiles for references TileBase[] tiles = new TileBase[( (Tilemap) component ).GetUsedTilesCount()]; ( (Tilemap) component ).GetUsedTilesNonAlloc( tiles ); @@ -424,7 +432,7 @@ namespace AssetUsageDetectorNamespace #if UNITY_2017_1_OR_NEWER else if( component is PlayableDirector ) { - // If this component is a PlayableDirectory, search its PlayableAsset's scene bindings for references + // Search the PlayableAsset's scene bindings for references PlayableAsset playableAsset = ( (PlayableDirector) component ).playableAsset; if( playableAsset != null && !playableAsset.Equals( null ) ) { @@ -536,7 +544,7 @@ namespace AssetUsageDetectorNamespace { Object defaultValue = scriptImporter.GetDefaultReference( variables[i].name ); if( objectsToSearchSet.Contains( defaultValue ) ) - referenceNode.AddLinkTo( GetReferenceNode( defaultValue ), "Default Variable Value: " + variables[i].name ); + referenceNode.AddLinkTo( GetReferenceNode( defaultValue ), "Default variable value: " + variables[i].name ); } } @@ -719,9 +727,12 @@ namespace AssetUsageDetectorNamespace #else string assemblyPath = CompilationPipeline.GetAssemblyDefinitionFilePathFromAssemblyName( assemblyDefinitionFile.references[i] ); #endif - Object searchedAssemblyDefinitionFile; - if( assemblyDefinitionFilesToSearch.TryGetValue( assemblyPath, out searchedAssemblyDefinitionFile ) ) - referenceNode.AddLinkTo( GetReferenceNode( searchedAssemblyDefinitionFile ), "Referenced Assembly" ); + if( !string.IsNullOrEmpty( assemblyPath ) ) + { + Object searchedAssemblyDefinitionFile; + if( assemblyDefinitionFilesToSearch.TryGetValue( assemblyPath, out searchedAssemblyDefinitionFile ) ) + referenceNode.AddLinkTo( GetReferenceNode( searchedAssemblyDefinitionFile ), "Referenced Assembly" ); + } } } diff --git a/package.json b/package.json index 6b51cba..1d7e5cc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "com.yasirkula.assetusagedetector", "displayName": "Asset Usage Detector", - "version": "1.8.7", + "version": "1.8.8", "description": "This editor extension helps you figure out at which places an asset or GameObject is used, i.e. lists the objects that refer to the asset. It is possible to search for references in the Assets folder (Project view) and/or in the scene(s) of your project. You can also search for references while in Play mode!" }