Merge pull request #1212 from aoowweenn/umw_dev

MikuMikuDance Format
This commit is contained in:
Kim Kulling
2017-05-17 12:01:46 +02:00
committed by GitHub
20 changed files with 3430 additions and 38 deletions

View File

@@ -192,6 +192,9 @@ corresponding preprocessor flag to selectively disable formats.
#ifndef ASSIMP_BUILD_NO_X3D_IMPORTER
# include "X3DImporter.hpp"
#endif
#ifndef ASSIMP_BUILD_NO_MMD_IMPORTER
# include "MMDImporter.h"
#endif
namespace Assimp {
@@ -336,11 +339,14 @@ void GetImporterInstanceList(std::vector< BaseImporter* >& out)
out.push_back( new C4DImporter() );
#endif
#if ( !defined ASSIMP_BUILD_NO_3MF_IMPORTER )
out.push_back(new D3MFImporter() );
out.push_back( new D3MFImporter() );
#endif
#ifndef ASSIMP_BUILD_NO_X3D_IMPORTER
out.push_back( new X3DImporter() );
#endif
#ifndef ASSIMP_BUILD_NO_MMD_IMPORTER
out.push_back( new MMDImporter() );
#endif
}
/** will delete all registered importers. */