From 8e7369e44e8ca89b7915d74e0cba0414ee9a2515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=BCleyman=20Yasir=20KULA?= Date: Sun, 28 Mar 2021 19:57:44 +0300 Subject: [PATCH] Some properties in Project Settings like "Quality Settings->SRP Asset" weren't included in search, fixed --- .../AssetUsageDetectorSearchFunctions.cs | 38 ++++++++++++------- package.json | 2 +- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs index 69a68a0..2a277cf 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs @@ -1021,26 +1021,38 @@ namespace AssetUsageDetectorNamespace SerializedProperty iteratorVisible = so.GetIterator(); if( iterator.Next( true ) ) { + string assetPath = AssetDatabase.GetAssetPath( (Object) referenceNode.nodeObject ); + bool isProjectSettings = !string.IsNullOrEmpty( assetPath ) && assetPath.StartsWithFast( "ProjectSettings/" ); + bool iteratingVisible = iteratorVisible.NextVisible( true ); bool enterChildren; do { - // Iterate over NextVisible properties AND the properties that have corresponding FieldInfos (internal Unity - // properties don't have FieldInfos so we are skipping them, which is good because search results found in - // those properties aren't interesting and mostly confusing) - bool isVisible = iteratingVisible && SerializedProperty.EqualContents( iterator, iteratorVisible ); - if( isVisible ) - iteratingVisible = iteratorVisible.NextVisible( true ); + if( isProjectSettings ) + { + // Search Project Settings in full because for some reason, important settings like SRP asset + // slot in Quality Settings aren't searched when iterating over only visible properties + enterChildren = true; + } else { - Type propFieldType; - isVisible = iterator.type == "Array" || fieldInfoGetter( iterator, out propFieldType ) != null; - } + // Iterate over NextVisible properties AND the properties that have corresponding FieldInfos (internal Unity + // properties don't have FieldInfos so we are skipping them, which is good because search results found in + // those properties aren't interesting and mostly confusing) + bool isVisible = iteratingVisible && SerializedProperty.EqualContents( iterator, iteratorVisible ); + if( isVisible ) + iteratingVisible = iteratorVisible.NextVisible( true ); + else + { + Type propFieldType; + isVisible = iterator.type == "Array" || fieldInfoGetter( iterator, out propFieldType ) != null; + } - if( !isVisible ) - { - enterChildren = false; - continue; + if( !isVisible ) + { + enterChildren = false; + continue; + } } ReferenceNode searchResult; diff --git a/package.json b/package.json index 6889638..6f085b5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.yasirkula.assetusagedetector", "displayName": "Asset Usage Detector", - "version": "1.9.2", + "version": "1.9.3", "documentationUrl": "https://github.com/yasirkula/UnityAssetUsageDetector", "changelogUrl": "https://github.com/yasirkula/UnityAssetUsageDetector/releases", "licensesUrl": "https://github.com/yasirkula/UnityAssetUsageDetector/blob/master/LICENSE.txt",