Merge remote-tracking branch 'graphics/virtualtexturing-shader-lib-fixes' into vfx/staging

Author: julienf-unity

com.unity.visualeffectgraph/Editor/Utilities/VectorFieldImporter/Editor/VectorFieldImporter.cs

@@ -5,12 +5,12 @@
 using System.Text;
 using System.Globalization;
 using UnityEngine;
-using UnityEditor.Experimental.AssetImporters;
+
 
 namespace UnityEditor.VFXToolbox
 {
-    [ScriptedImporter(1, "vf")]
-    class VectorFieldImporter : ScriptedImporter
+    [UnityEditor.AssetImporters.ScriptedImporter(1, "vf")]
+    class VectorFieldImporter : UnityEditor.AssetImporters.ScriptedImporter
     {
         public enum VectorFieldOutputFormat
         {
@@ -32,7 +32,7 @@ public static T[] SubArray<T>(T[] data, int index, int length)
             return result;
         }
 
-        public override void OnImportAsset(AssetImportContext ctx)
+        public override void OnImportAsset(UnityEditor.AssetImporters.AssetImportContext ctx)
         {
             byte[] bytes = File.ReadAllBytes(ctx.assetPath);
             int width = 1, height = 1, depth = 1;

com.unity.visualeffectgraph/Editor/Utilities/VectorFieldImporter/Editor/VectorFieldImporterEditor.cs

@@ -1,10 +1,10 @@
 using UnityEngine;
-using UnityEditor.Experimental.AssetImporters;
+
 
 namespace UnityEditor.VFXToolbox
 {
     [CustomEditor(typeof(VectorFieldImporter))]
-    class VectorFieldImporterEditor : ScriptedImporterEditor
+    class VectorFieldImporterEditor : UnityEditor.AssetImporters.ScriptedImporterEditor
     {
         SerializedProperty format;
         SerializedProperty wrapMode;

com.unity.visualeffectgraph/Editor/Utilities/pCache/Importer/PointCacheImporter.cs

@@ -5,12 +5,12 @@
 using System.Text;
 using System.Globalization;
 using UnityEngine;
-using UnityEditor.Experimental.AssetImporters;
+
 
 namespace UnityEditor.Experimental.VFX.Utility
 {
-    [ScriptedImporter(1, "pcache")]
-    class PointCacheImporter : ScriptedImporter
+    [UnityEditor.AssetImporters.ScriptedImporter(1, "pcache")]
+    class PointCacheImporter : UnityEditor.AssetImporters.ScriptedImporter
     {
         public static T[] SubArray<T>(T[] data, int index, int length)
         {
@@ -77,7 +77,7 @@ public static void GetHeader(Stream s, out long byteLength, out List<string> lin
             while (!found_end_header);
         }
 
-        public override void OnImportAsset(AssetImportContext ctx)
+        public override void OnImportAsset(UnityEditor.AssetImporters.AssetImportContext ctx)
         {
             try
             {