abma
|
8c45a4dc3b
|
Merge remote-tracking branch 'origin'
Conflicts:
code/C4DImporter.cpp
code/OgreImporter.h
|
2015-04-16 01:03:00 +02:00 |
|
abma
|
bf4913b5c9
|
remove AssimpPCH.h: fixes #534
|
2015-04-16 01:00:17 +02:00 |
|
abma
|
470ad98281
|
fix "headercheck":
part of https://github.com/assimp/assimp/issues/534
|
2015-04-15 21:22:26 +02:00 |
Alexander Gessler
|
8666b614c6
|
Fix non-determinism in XGL importer output due to std::multimap value ordering not guaranteed < C++11.
One step closer to a fully reproducible regression test suite.
|
2015-03-26 22:45:00 +01:00 |
aramis_acg
|
5a81b42ebe
|
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1234 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
|
2012-04-22 22:26:26 +00:00 |
|
aramis_acg
|
397603bac0
|
+ add XGL/ZGL importer. Some features (includes, object refs, textures not supported yet).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1210 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
|
2012-03-20 16:52:33 +00:00 |