Fixed NullReferenceException on newest Unity versions if VFX Graph package is installed

Author: yasirkula

Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs

@@ -217,8 +217,9 @@ private static string ExtractGUIDFromString( string str )
 #endif
 
 #if ASSET_USAGE_VFX_GRAPH
-		private readonly Func<string, object> vfxResourceGetter = (Func<string, object>) Delegate.CreateDelegate( typeof( Func<string, object> ), typeof( Editor ).Assembly.GetType( "UnityEditor.VFX.VisualEffectResource" ).GetMethod( "GetResourceAtPath", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static ) );
-		private readonly MethodInfo vfxResourceContentsGetter = typeof( Editor ).Assembly.GetType( "UnityEditor.VFX.VisualEffectResource" ).GetMethod( "GetContents", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance );
+		private static Type vfxResourceType => typeof( Editor ).Assembly.GetType( "UnityEditor.VFX.VisualEffectResource" ) ?? Array.Find( AppDomain.CurrentDomain.GetAssemblies(), ( assembly ) => assembly.GetName().Name == "UnityEditor.VFXModule" ).GetType( "UnityEditor.VFX.VisualEffectResource" );
+		private readonly Func<string, object> vfxResourceGetter = (Func<string, object>) Delegate.CreateDelegate( typeof( Func<string, object> ), vfxResourceType.GetMethod( "GetResourceAtPath", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static ) );
+		private readonly MethodInfo vfxResourceContentsGetter = vfxResourceType.GetMethod( "GetContents", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance );
 		private readonly MethodInfo vfxSerializableObjectValueGetter = Array.Find( Array.Find( AppDomain.CurrentDomain.GetAssemblies(), ( assembly ) => assembly.GetName().Name == "Unity.VisualEffectGraph.Editor" ).GetType( "UnityEditor.VFX.VFXSerializableObject" ).GetMethods( BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance ), ( methodInfo ) => methodInfo.Name == "Get" && !methodInfo.IsGenericMethod );
 #endif
 

Plugins/AssetUsageDetector/README.txt

@@ -1,4 +1,4 @@
-= Asset Usage Detector (v2.5.1) =
+= Asset Usage Detector (v2.5.2) =
 
 Documentation: https://github.com/yasirkula/UnityAssetUsageDetector
 E-mail: yasirkula@gmail.com

package.json

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