Compare commits

...

2 Commits

Author SHA1 Message Date
yasirkula d57a707678 Fixed exceptions while searching for some URP assets' references due to their overriden GetHashCode functions 2023-03-18 15:12:13 +03:00
yasirkula 3fa3344507 Fixed #33 2023-03-18 15:09:37 +03:00
5 changed files with 16 additions and 15 deletions
@@ -350,7 +350,7 @@ namespace AssetUsageDetectorNamespace
// Initialize the nodes of searched asset(s)
foreach( Object obj in objectsToSearchSet )
searchedUnityObjects.Add( obj.GetHashCode(), PopReferenceNode( obj ) );
searchedUnityObjects.Add( obj.GetInstanceID(), PopReferenceNode( obj ) );
// Progressbar values
int searchProgress = 0;
@@ -672,7 +672,7 @@ namespace AssetUsageDetectorNamespace
else
{
for( Transform parent = ( (GameObject) obj ).transform.parent; parent != null; parent = parent.parent )
usedObjectPathsSet.Add( parent.gameObject.GetHashCode().ToString() );
usedObjectPathsSet.Add( parent.gameObject.GetInstanceID().ToString() );
}
}
}
@@ -739,13 +739,13 @@ namespace AssetUsageDetectorNamespace
if( !searchedTopmostGameObject )
{
if( obj is GameObject )
unusedMainObjectNodes[obj.GetHashCode().ToString()] = node;
unusedMainObjectNodes[obj.GetInstanceID().ToString()] = node;
else
currentSearchResultGroup.AddReference( node );
}
else // List child GameObject scene objects under their parent GameObject
{
string dictionaryKey = searchedTopmostGameObject.GetHashCode().ToString();
string dictionaryKey = searchedTopmostGameObject.GetInstanceID().ToString();
List<ReferenceNode> unusedSubObjectNodesAtPath;
if( !unusedSubObjectNodes.TryGetValue( dictionaryKey, out unusedSubObjectNodesAtPath ) )
unusedSubObjectNodes[dictionaryKey] = unusedSubObjectNodesAtPath = new List<ReferenceNode>( 2 );
@@ -1012,14 +1012,14 @@ namespace AssetUsageDetectorNamespace
{
if( assetsToSearchSet.Count == 0 )
{
searchedUnityObjects.Add( unityObject.GetHashCode(), null );
searchedUnityObjects.Add( unityObject.GetInstanceID(), null );
return null;
}
assetPath = AssetDatabase.GetAssetPath( unityObject );
if( excludedAssetsPathsSet.Contains( assetPath ) || !AssetHasAnyReference( assetPath ) )
{
searchedUnityObjects.Add( unityObject.GetHashCode(), null );
searchedUnityObjects.Add( unityObject.GetInstanceID(), null );
return null;
}
}
@@ -1089,13 +1089,13 @@ namespace AssetUsageDetectorNamespace
if( !searchingSourceAsset )
{
if( obj is Object )
searchedUnityObjects.Add( unityObject.GetHashCode(), result );
searchedUnityObjects.Add( unityObject.GetInstanceID(), result );
else
searchedObjects.Add( GetNodeObjectHash( obj ), result );
}
else if( result != null )
{
result.CopyReferencesTo( searchedUnityObjects[unityObject.GetHashCode()] );
result.CopyReferencesTo( searchedUnityObjects[unityObject.GetInstanceID()] );
PoolReferenceNode( result );
}
}
@@ -1229,7 +1229,7 @@ namespace AssetUsageDetectorNamespace
{
if( nodeObject is Object )
{
if( searchedUnityObjects.TryGetValue( nodeObject.GetHashCode(), out referenceNode ) )
if( searchedUnityObjects.TryGetValue( ( (Object) nodeObject ).GetInstanceID(), out referenceNode ) )
return true;
}
else if( searchedObjects.TryGetValue( GetNodeObjectHash( nodeObject ), out referenceNode ) )
@@ -1245,7 +1245,7 @@ namespace AssetUsageDetectorNamespace
ReferenceNode result;
if( nodeObject is Object )
{
int hash = nodeObject.GetHashCode();
int hash = ( (Object) nodeObject ).GetInstanceID();
if( !searchedUnityObjects.TryGetValue( hash, out result ) || result == null )
{
result = PopReferenceNode( nodeObject );
@@ -1419,8 +1419,9 @@ namespace AssetUsageDetectorNamespace
break;
#if UNITY_2019_3_OR_NEWER
case SerializedPropertyType.ManagedReference:
propertyValue = GetRawSerializedPropertyValue( iterator ) as Object;
searchResult = SearchObject( PreferablyGameObject( propertyValue ) );
object managedReferenceValue = GetRawSerializedPropertyValue( iterator );
propertyValue = managedReferenceValue as Object;
searchResult = SearchObject( PreferablyGameObject( managedReferenceValue ) );
enterChildren = false;
break;
#endif
@@ -299,7 +299,7 @@ namespace AssetUsageDetectorNamespace
if( linkDescriptions.Count > 0 )
{
Object prefabObject = PrefabUtility.GetCorrespondingObjectFromSource( unityObject );
if( prefabObject && parentData.node.HasLinkToObjectWithDescriptions( prefabObject.GetHashCode(), linkDescriptions ) )
if( prefabObject && parentData.node.HasLinkToObjectWithDescriptions( prefabObject.GetInstanceID(), linkDescriptions ) )
return false;
}
}
+1 -1
View File
@@ -1,4 +1,4 @@
= Asset Usage Detector (v2.3.0) =
= Asset Usage Detector (v2.3.1) =
Online documentation available at: https://github.com/yasirkula/UnityAssetUsageDetector
E-mail: yasirkula@gmail.com
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "com.yasirkula.assetusagedetector",
"displayName": "Asset Usage Detector",
"version": "2.3.0",
"version": "2.3.1",
"documentationUrl": "https://github.com/yasirkula/UnityAssetUsageDetector",
"changelogUrl": "https://github.com/yasirkula/UnityAssetUsageDetector/releases",
"licensesUrl": "https://github.com/yasirkula/UnityAssetUsageDetector/blob/master/LICENSE.txt",