Merge branch 'master' into x3d_pugi_migration_artenuvielle

2021-10-14 09:27:07 +02:00
parent d814e9067a f678e67974
commit a82dc887fc
34 changed files with 123 additions and 92 deletions
--- a/code/Common/ImporterRegistry.cpp
+++ b/code/Common/ImporterRegistry.cpp
@@ -46,6 +46,7 @@ directly (unless you are adding new loaders), instead use the
 corresponding preprocessor flag to selectively disable formats.
 */

+#include <assimp/anim.h>
 #include <assimp/BaseImporter.h>
 #include <vector>
 #include <cstdlib>