FTV-759 Update Alembic namespace (#341)

* More yamato unity versions Yamato trunk version fix. * FTV-759: change namespace for AlembicImporter
Unity-Technologies · Jun 30, 2020 · e41f2e0 · e41f2e0
1 parent a00d789
commit e41f2e0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
@@ -1,5 +1,8 @@
 editors:
-  - version: 2019.4  
+  - version: 2019.4 
+  - version: 2020.1
+  - version: trunk
+
 platforms:
   - name: win
     type: Unity::VM

diff --git a/com.unity.formats.alembic/Editor/Importer/AlembicImporter.cs b/com.unity.formats.alembic/Editor/Importer/AlembicImporter.cs
@@ -1,14 +1,14 @@
-#if UNITY_2017_1_OR_NEWER
-
 using System.Collections.Generic;
 using System.IO;
-using System.Text.RegularExpressions;
-using UnityEditor;
 using UnityEngine;
-using UnityEditor.Experimental.AssetImporters;
 using UnityEngine.Formats.Alembic.Importer;
 using UnityEngine.Formats.Alembic.Sdk;
 using Object = UnityEngine.Object;
+#if UNITY_2020_2_OR_NEWER
+    using UnityEditor.AssetImporters;
+#else
+    using UnityEditor.Experimental.AssetImporters;
+#endif
 
 namespace UnityEditor.Formats.Alembic.Importer
 {
@@ -398,5 +398,3 @@ bool AddFrameEvents(AnimationClip clip, aiTimeSampling ts)
         }
     }
 }
-
-#endif
diff --git a/com.unity.formats.alembic/Editor/Importer/AlembicImporterEditor.cs b/com.unity.formats.alembic/Editor/Importer/AlembicImporterEditor.cs
@@ -5,7 +5,11 @@
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Formats.Alembic.Sdk;
+#if UNITY_2020_2_OR_NEWER
+using UnityEditor.AssetImporters;
+#else
 using UnityEditor.Experimental.AssetImporters;
+#endif
 
 namespace UnityEditor.Formats.Alembic.Importer
 {