Skip to content

Commit 9e1769e

Browse files
committed
インポート優先順を変更
1 parent 25bd315 commit 9e1769e

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

code/Common/ImporterRegistry.cpp

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,14 @@ void GetImporterInstanceList(std::vector<BaseImporter *> &out) {
225225
// (register_new_importers_here)
226226
// ----------------------------------------------------------------------------
227227
out.reserve(64);
228+
//
229+
#if (!defined ASSIMP_BUILD_NO_GLTF_IMPORTER && !defined ASSIMP_BUILD_NO_GLTF1_IMPORTER)
230+
out.push_back(new glTFImporter());
231+
#endif
232+
#if (!defined ASSIMP_BUILD_NO_GLTF_IMPORTER && !defined ASSIMP_BUILD_NO_GLTF2_IMPORTER)
233+
out.push_back(new glTF2Importer());
234+
#endif
235+
//
228236
#if (!defined ASSIMP_BUILD_NO_X_IMPORTER)
229237
out.push_back(new XFileImporter());
230238
#endif
@@ -356,12 +364,12 @@ void GetImporterInstanceList(std::vector<BaseImporter *> &out) {
356364
#if (!defined ASSIMP_BUILD_NO_ASSBIN_IMPORTER)
357365
out.push_back(new AssbinImporter());
358366
#endif
359-
#if (!defined ASSIMP_BUILD_NO_GLTF_IMPORTER && !defined ASSIMP_BUILD_NO_GLTF1_IMPORTER)
360-
out.push_back(new glTFImporter());
361-
#endif
362-
#if (!defined ASSIMP_BUILD_NO_GLTF_IMPORTER && !defined ASSIMP_BUILD_NO_GLTF2_IMPORTER)
363-
out.push_back(new glTF2Importer());
364-
#endif
367+
//#if (!defined ASSIMP_BUILD_NO_GLTF_IMPORTER && !defined ASSIMP_BUILD_NO_GLTF1_IMPORTER)
368+
// out.push_back(new glTFImporter());
369+
//#endif
370+
//#if (!defined ASSIMP_BUILD_NO_GLTF_IMPORTER && !defined ASSIMP_BUILD_NO_GLTF2_IMPORTER)
371+
// out.push_back(new glTF2Importer());
372+
//#endif
365373
#if (!defined ASSIMP_BUILD_NO_C4D_IMPORTER)
366374
out.push_back(new C4DImporter());
367375
#endif

0 commit comments

Comments
 (0)