From 5773281ca26b43db340356b435a829726d545eef Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 6 Jun 2022 16:43:15 +0900 Subject: [PATCH] For multiple gltf, glb importer conflicts. --- .../Editor/UniGLTF/ScriptedImporter/GlbScriptedImporter.cs | 6 +++++- .../Editor/UniGLTF/ScriptedImporter/GltfScriptedImporter.cs | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporter.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporter.cs index 3c952fc04..67b9200cd 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporter.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporter.cs @@ -7,7 +7,11 @@ using UnityEditor.Experimental.AssetImporters; namespace UniGLTF { - [ScriptedImporter(1, "glb")] +#if UNITY_2020_2_OR_NEWER + [ScriptedImporter(1, null, overrideExts: new[] { "glb" })] +#else + [ScriptedImporter(1, new[] { "glb" })] +#endif public class GlbScriptedImporter : GltfScriptedImporterBase { public override void OnImportAsset(AssetImportContext ctx) diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporter.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporter.cs index 39d8914ba..16d2a3540 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporter.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporter.cs @@ -7,7 +7,11 @@ using UnityEditor.Experimental.AssetImporters; namespace UniGLTF { - [ScriptedImporter(1, "gltf")] +#if UNITY_2020_2_OR_NEWER + [ScriptedImporter(1, null, overrideExts: new[] { "gltf" })] +#else + [ScriptedImporter(1, new[] { "gltf" })] +#endif public class GltfScriptedImporter : GltfScriptedImporterBase { public override void OnImportAsset(AssetImportContext ctx)