From a1b66ced77f9eeeadf3563f18eb86f6b33d3d136 Mon Sep 17 00:00:00 2001 From: yasirkula Date: Sun, 21 Dec 2025 15:15:18 +0300 Subject: [PATCH] Removed pre-2021.3 compiler directives to simplify the codebase --- .../AssetUsageDetector/Editor/AssetUsageDetector.cs | 4 ---- .../Editor/AssetUsageDetectorSearchFunctions.cs | 10 ---------- .../Editor/AssetUsageDetectorWindow.cs | 8 +------- .../AssetUsageDetector/Editor/SearchResultTreeView.cs | 8 +------- Plugins/AssetUsageDetector/Editor/Utilities.cs | 4 ---- 5 files changed, 2 insertions(+), 32 deletions(-) diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs index 0366c0d..45a03dc 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs @@ -8,10 +8,6 @@ using System; using System.IO; using System.Text; using Object = UnityEngine.Object; -#if UNITY_2018_3_OR_NEWER && !UNITY_2021_2_OR_NEWER -using PrefabStage = UnityEditor.Experimental.SceneManagement.PrefabStage; -using PrefabStageUtility = UnityEditor.Experimental.SceneManagement.PrefabStageUtility; -#endif namespace AssetUsageDetectorNamespace { diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs index 12ef3d9..731ea2b 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs @@ -181,9 +181,7 @@ namespace AssetUsageDetectorNamespace private readonly FieldInfoGetter fieldInfoGetter = (FieldInfoGetter) Delegate.CreateDelegate( typeof( FieldInfoGetter ), typeof( Editor ).Assembly.GetType( "UnityEditor.ScriptAttributeUtility" ).GetMethod( "GetFieldInfoAndStaticTypeFromProperty", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static ) ); private readonly Func lightmapSettingsGetter = (Func) Delegate.CreateDelegate( typeof( Func ), typeof( LightmapEditorSettings ).GetMethod( "GetLightmapSettings", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static ) ); private readonly Func renderSettingsGetter = (Func) Delegate.CreateDelegate( typeof( Func ), typeof( RenderSettings ).GetMethod( "GetRenderSettings", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static ) ); -#if UNITY_2021_2_OR_NEWER private readonly Func defaultReflectionProbeGetter = (Func) Delegate.CreateDelegate( typeof( Func ), typeof( RenderSettings ).GetProperty( "defaultReflection", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static ).GetGetMethod( true ) ); -#endif internal static readonly Func spriteAtlasPackedSpritesGetter = (Func) Delegate.CreateDelegate( typeof( Func ), typeof( SpriteAtlasExtensions ).GetMethod( "GetPackedSprites", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static ) ); #if ASSET_USAGE_ADDRESSABLES @@ -985,11 +983,7 @@ namespace AssetUsageDetectorNamespace { ReferenceNode referenceNode = PopReferenceNode( obj ); -#if UNITY_2021_2_OR_NEWER referenceNode.AddLinkTo( SearchObject( defaultReflectionProbeGetter() ), "Default Reflection Probe" ); -#else - referenceNode.AddLinkTo( SearchObject( ReflectionProbe.defaultTexture ), "Default Reflection Probe" ); -#endif SearchVariablesWithSerializedObject( referenceNode, true ); return referenceNode; } @@ -1625,11 +1619,9 @@ namespace AssetUsageDetectorNamespace if( field.FieldType.IsIgnoredUnityType() ) continue; -#if UNITY_2021_2_OR_NEWER // "ref struct"s can't be accessed via reflection if( field.FieldType.IsByRefLike ) continue; -#endif // Additional filtering for fields: // 1- Ignore "m_RectTransform", "m_CanvasRenderer" and "m_Canvas" fields of Graphic components @@ -1665,11 +1657,9 @@ namespace AssetUsageDetectorNamespace if( property.PropertyType.IsIgnoredUnityType() ) continue; -#if UNITY_2021_2_OR_NEWER // "ref struct"s can't be accessed via reflection if( property.PropertyType.IsByRefLike ) continue; -#endif // Skip properties without a getter function MethodInfo propertyGetter = property.GetGetMethod( true ); diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs index 28d30b7..ed475db 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs @@ -1,15 +1,9 @@ using UnityEngine; using UnityEditor; +using UnityEditor.SceneManagement; using System.Collections.Generic; using System.Reflection; using Object = UnityEngine.Object; -#if UNITY_2021_2_OR_NEWER -using PrefabStage = UnityEditor.SceneManagement.PrefabStage; -using PrefabStageUtility = UnityEditor.SceneManagement.PrefabStageUtility; -#elif UNITY_2018_3_OR_NEWER -using PrefabStage = UnityEditor.Experimental.SceneManagement.PrefabStage; -using PrefabStageUtility = UnityEditor.Experimental.SceneManagement.PrefabStageUtility; -#endif namespace AssetUsageDetectorNamespace { diff --git a/Plugins/AssetUsageDetector/Editor/SearchResultTreeView.cs b/Plugins/AssetUsageDetector/Editor/SearchResultTreeView.cs index 5388686..a612899 100644 --- a/Plugins/AssetUsageDetector/Editor/SearchResultTreeView.cs +++ b/Plugins/AssetUsageDetector/Editor/SearchResultTreeView.cs @@ -4,14 +4,8 @@ using System.Reflection; using System.Text; using UnityEditor; using UnityEditor.IMGUI.Controls; +using UnityEditor.SceneManagement; using UnityEngine; -#if UNITY_2021_2_OR_NEWER -using PrefabStage = UnityEditor.SceneManagement.PrefabStage; -using PrefabStageUtility = UnityEditor.SceneManagement.PrefabStageUtility; -#elif UNITY_2018_3_OR_NEWER -using PrefabStage = UnityEditor.Experimental.SceneManagement.PrefabStage; -using PrefabStageUtility = UnityEditor.Experimental.SceneManagement.PrefabStageUtility; -#endif namespace AssetUsageDetectorNamespace { diff --git a/Plugins/AssetUsageDetector/Editor/Utilities.cs b/Plugins/AssetUsageDetector/Editor/Utilities.cs index f6f4105..61f47d6 100644 --- a/Plugins/AssetUsageDetector/Editor/Utilities.cs +++ b/Plugins/AssetUsageDetector/Editor/Utilities.cs @@ -8,10 +8,6 @@ using UnityEditor.SceneManagement; using UnityEngine; using UnityEngine.SceneManagement; using Object = UnityEngine.Object; -#if UNITY_2018_3_OR_NEWER && !UNITY_2021_2_OR_NEWER -using PrefabStage = UnityEditor.Experimental.SceneManagement.PrefabStage; -using PrefabStageUtility = UnityEditor.Experimental.SceneManagement.PrefabStageUtility; -#endif namespace AssetUsageDetectorNamespace {