mirror of
https://github.com/yasirkula/UnityAssetUsageDetector.git
synced 2026-11-19 14:32:37 +08:00
"Hide redundant prefab variant links" setting now works as expected, only affecting variables in components and not affecting prefab/MonoScript usages
This commit is contained in:
@@ -1451,6 +1451,9 @@ namespace AssetUsageDetectorNamespace
|
||||
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 @@ namespace AssetUsageDetectorNamespace
|
||||
|
||||
if( !isVisible )
|
||||
enterChildren = false;
|
||||
#if UNITY_2018_3_OR_NEWER
|
||||
else if( searchPrefabOverridesOnly && !iterator.prefabOverride )
|
||||
enterChildren = false;
|
||||
#endif
|
||||
else
|
||||
{
|
||||
Object propertyValue;
|
||||
|
||||
@@ -1180,30 +1180,6 @@ namespace AssetUsageDetectorNamespace
|
||||
}
|
||||
}
|
||||
|
||||
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();
|
||||
|
||||
@@ -287,25 +287,6 @@ namespace AssetUsageDetectorNamespace
|
||||
|
||||
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 );
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
= Asset Usage Detector (v2.5.0) =
|
||||
= Asset Usage Detector (v2.5.1) =
|
||||
|
||||
Documentation: https://github.com/yasirkula/UnityAssetUsageDetector
|
||||
E-mail: yasirkula@gmail.com
|
||||
+1
-1
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user