"Hide redundant prefab variant links" setting now works as expected, …

…only affecting variables in components and not affecting prefab/MonoScript usages

Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs

@@ -1451,6 +1451,9 @@ private void SearchVariablesWithSerializedObject( ReferenceNode referenceNode, b
 				if( iterator.Next( true ) )
 				{
 					bool iteratingVisible = iteratorVisible.NextVisible( true );
+#if UNITY_2018_3_OR_NEWER
+					bool searchPrefabOverridesOnly = searchParameters.hideReduntantPrefabVariantLinks && unityObject.IsAsset() && PrefabUtility.GetCorrespondingObjectFromSource( unityObject ) != null;
+#endif
 					bool enterChildren;
 					do
 					{
@@ -1467,6 +1470,10 @@ private void SearchVariablesWithSerializedObject( ReferenceNode referenceNode, b
 
 						if( !isVisible )
 							enterChildren = false;
+#if UNITY_2018_3_OR_NEWER
+						else if( searchPrefabOverridesOnly && !iterator.prefabOverride )
+							enterChildren = false;
+#endif
 						else
 						{
 							Object propertyValue;

Plugins/AssetUsageDetector/Editor/SearchResult.cs

@@ -1180,30 +1180,6 @@ public void SortLinks()
 			}
 		}
 
-		internal bool HasLinkToObjectWithDescriptions( int instanceId, List<string> descriptions )
-		{
-			for( int i = links.Count - 1; i >= 0; i-- )
-			{
-				Link link = links[i];
-				if( link.targetNode.instanceId == instanceId )
-				{
-					List<string> _descriptions = link.descriptions;
-					if( _descriptions.Count != descriptions.Count )
-						return false;
-
-					for( int j = _descriptions.Count - 1; j >= 0; j-- )
-					{
-						if( _descriptions[j] != descriptions[j] )
-							return false;
-					}
-
-					return true;
-				}
-			}
-
-			return false;
-		}
-
 		public void CopyReferencesTo( ReferenceNode other )
 		{
 			other.links.Clear();

Plugins/AssetUsageDetector/Editor/SearchResultTreeView.cs

@@ -287,25 +287,6 @@ protected override TreeViewItem BuildRoot()
 
 		private bool GenerateRowsRecursive( TreeViewItem parent, ReferenceNode referenceNode, ReferenceNodeData parentData, int siblingIndex, int depth, bool? itemForcedVisibility, List<ReferenceNode> stack, HashSet<ReferenceNode> processedNodes, ref int id )
 		{
-#if UNITY_2018_3_OR_NEWER
-			// If the same reference is found in both a prefab variant and its base prefab, omit the prefab variant to reduce the number of
-			// redundant links (changing the value in base prefab will automatically change the value in its variants, after all)
-			if( hideReduntantPrefabVariantLinks && depth > 0 )
-			{
-				Object unityObject = referenceNode.UnityObject;
-				if( unityObject && ( unityObject is Component || unityObject is GameObject ) && unityObject.IsAsset() )
-				{
-					List<string> linkDescriptions = parentData.node[siblingIndex].descriptions;
-					if( linkDescriptions.Count > 0 )
-					{
-						Object prefabObject = PrefabUtility.GetCorrespondingObjectFromSource( unityObject );
-						if( prefabObject && parentData.node.HasLinkToObjectWithDescriptions( prefabObject.GetInstanceID(), linkDescriptions ) )
-							return false;
-					}
-				}
-			}
-#endif
-
 			TreeViewItem item = new TreeViewItem( id++, depth, "" );
 			ReferenceNodeData data = new ReferenceNodeData( item, referenceNode, parentData, siblingIndex );
 

Plugins/AssetUsageDetector/README.txt

@@ -1,4 +1,4 @@
-= Asset Usage Detector (v2.5.0) =
+= Asset Usage Detector (v2.5.1) =
 
 Documentation: https://github.com/yasirkula/UnityAssetUsageDetector
 E-mail: [email protected]

package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.yasirkula.assetusagedetector",
   "displayName": "Asset Usage Detector",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "documentationUrl": "https://github.com/yasirkula/UnityAssetUsageDetector",
   "changelogUrl": "https://github.com/yasirkula/UnityAssetUsageDetector/releases",
   "licensesUrl": "https://github.com/yasirkula/UnityAssetUsageDetector/blob/master/LICENSE.txt",