Skip to content

Commit 8c9940c

Browse files
committed
Wrap glTF scripted importers with !MRTK_GLTF_IMPORTER_OFF
This enables them to be turned off if they collide with other importers like TriLib
1 parent b3c4f8e commit 8c9940c

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Assets/MRTK/Core/Utilities/Gltf/Serialization/Importers/GlbAssetImporter.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@
99

1010
namespace Microsoft.MixedReality.Toolkit.Utilities.Gltf.Serialization.Editor
1111
{
12+
#if !MRTK_GLTF_IMPORTER_OFF
1213
[ScriptedImporter(1, "glb")]
14+
#endif // !MRTK_GLTF_IMPORTER_OFF
1315
public class GlbAssetImporter : ScriptedImporter
1416
{
1517
public override void OnImportAsset(AssetImportContext context)
1618
{
1719
GltfEditorImporter.OnImportGltfAsset(context);
1820
}
1921
}
20-
}
22+
}

Assets/MRTK/Core/Utilities/Gltf/Serialization/Importers/GltfAssetImporter.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@
99

1010
namespace Microsoft.MixedReality.Toolkit.Utilities.Gltf.Serialization.Editor
1111
{
12+
#if !MRTK_GLTF_IMPORTER_OFF
1213
[ScriptedImporter(1, "gltf")]
14+
#endif // !MRTK_GLTF_IMPORTER_OFF
1315
public class GltfAssetImporter : ScriptedImporter
1416
{
1517
public override void OnImportAsset(AssetImportContext context)
1618
{
1719
GltfEditorImporter.OnImportGltfAsset(context);
1820
}
1921
}
20-
}
22+
}

0 commit comments

Comments
 (0)