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

Merge branch 'master' into master

Browse Source
This commit is contained in:
Christian Meurin
2018-01-15 19:10:14 -08:00
committed by GitHub
parent d0c92e30be d0bf5c10f9
commit 86fa0f4524
14 changed files with 12621 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/ImporterRegistry.cpp
View File

@@ -169,7 +169,7 @@ corresponding preprocessor flag to selectively disable formats.
# include "NDOLoader.h"
#endif
#ifndef ASSIMP_BUILD_NO_IFC_IMPORTER
# include "IFCLoader.h"
# include "Importer/IFC/IFCLoader.h"
#endif
#ifndef ASSIMP_BUILD_NO_XGL_IMPORTER
# include "XGLLoader.h"