Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Duplicate gltfImporter as gltf2Importer; Include glTF2 importer in CMake List

Browse Source
This commit is contained in:
Daniel Hritzkiv
2017-08-24 17:15:48 -04:00
parent f7d39cfa71
commit 63d3655f1b
4 changed files with 775 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/ImporterRegistry.cpp
View File

@@ -181,7 +181,7 @@ corresponding preprocessor flag to selectively disable formats.
# include "AssbinLoader.h"
#endif
#ifndef ASSIMP_BUILD_NO_GLTF_IMPORTER
# include "glTFImporter.h"
# include "glTF2Importer.h"
#endif
#ifndef ASSIMP_BUILD_NO_C4D_IMPORTER
# include "C4DImporter.h"
@@ -335,7 +335,7 @@ void GetImporterInstanceList(std::vector< BaseImporter* >& out)
out.push_back( new AssbinImporter() );
#endif
#if ( !defined ASSIMP_BUILD_NO_GLTF_IMPORTER )
out.push_back( new glTFImporter() );
out.push_back( new glTF2Importer() );
#endif
#if ( !defined ASSIMP_BUILD_NO_C4D_IMPORTER )
out.push_back( new C4DImporter() );