summaryrefslogtreecommitdiff
path: root/thirdparty/assimp/code/Common/ImporterRegistry.cpp
diff options
context:
space:
mode:
authorRevoluPowered <gordon@gordonite.tech>2019-11-05 17:06:06 +0000
committerRevoluPowered <gordon@gordonite.tech>2019-11-05 20:38:26 +0000
commit5fb160c7c692c469488f11aca90a36ac3248dfee (patch)
treed1eba0971b63f8f8e39e6f2752fc8d9944960318 /thirdparty/assimp/code/Common/ImporterRegistry.cpp
parent0bd877780fb7b344b5ed1d2fa7765078616f069b (diff)
Updated assimp to 308db73 from https://github.com/assimp/assimp/
Diffstat (limited to 'thirdparty/assimp/code/Common/ImporterRegistry.cpp')
-rw-r--r--thirdparty/assimp/code/Common/ImporterRegistry.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/thirdparty/assimp/code/Common/ImporterRegistry.cpp b/thirdparty/assimp/code/Common/ImporterRegistry.cpp
index 32ac3b4168..b9f28f0356 100644
--- a/thirdparty/assimp/code/Common/ImporterRegistry.cpp
+++ b/thirdparty/assimp/code/Common/ImporterRegistry.cpp
@@ -197,6 +197,9 @@ corresponding preprocessor flag to selectively disable formats.
#ifndef ASSIMP_BUILD_NO_MMD_IMPORTER
# include "MMD/MMDImporter.h"
#endif
+#ifndef ASSIMP_BUILD_NO_M3D_IMPORTER
+# include "M3D/M3DImporter.h"
+#endif
#ifndef ASSIMP_BUILD_NO_STEP_IMPORTER
# include "Importer/StepFile/StepFileImporter.h"
#endif
@@ -223,6 +226,9 @@ void GetImporterInstanceList(std::vector< BaseImporter* >& out)
#if (!defined ASSIMP_BUILD_NO_3DS_IMPORTER)
out.push_back( new Discreet3DSImporter());
#endif
+#if (!defined ASSIMP_BUILD_NO_M3D_IMPORTER)
+ out.push_back( new M3DImporter());
+#endif
#if (!defined ASSIMP_BUILD_NO_MD3_IMPORTER)
out.push_back( new MD3Importer());
#endif