Jared Mulconry
|
f206249fbf
|
Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix
# Conflicts:
# code/AMFImporter_Postprocess.cpp
# code/FBXConverter.cpp
# code/IFCLoader.cpp
# code/NDOLoader.cpp
# code/glTFAsset.inl
|
2016-11-23 22:24:04 +11:00 |
|
Jared Mulconry
|
8478b03f22
|
Fixed build warnings on MSVC14 x64 in the NDO format sources.
|
2016-11-20 12:27:04 +11:00 |
wise86Android
|
5bec41ad16
|
122198 Resource leak
|
2016-09-24 20:11:07 +02:00 |
Kim Kulling
|
7207e5117c
|
Use new include bracktes.
|
2016-06-06 22:04:29 +02:00 |
mensinda
|
18843fe5e1
|
Replaced BOOST_FOREACH with c++11 ranged for loops
|
2016-04-05 22:53:54 +02:00 |
Eric Engestrom
|
87e7cf00a2
|
Fix spelling mistakes
|
2016-04-03 01:38:00 +01:00 |
|
Kim Kulling
|
1191d03405
|
Update license info.
|
2016-01-01 21:07:24 +01:00 |
Richard
|
83de707587
|
Refactor: Expand tabs to 4 spaces
|
2015-06-28 16:04:15 -06:00 |
|
Richard
|
a96a595a7a
|
Refactor: Trim trailing whitespace
|
2015-06-28 16:01:32 -06:00 |
|
Richard
|
4c1a0507fe
|
Refactor: Line endings are LF, not CRLF
|
2015-06-28 15:59:33 -06:00 |
|
Kim Kulling
|
2bfc353fde
|
License info: update year info.
|
2015-06-28 21:48:25 +02:00 |
|
Kim Kulling
|
02ee002878
|
fix build for vs2013
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
|
2015-04-16 11:38:53 +02:00 |
abma
|
bf4913b5c9
|
remove AssimpPCH.h: fixes #534
|
2015-04-16 01:00:17 +02:00 |
Alexander Gessler
|
5a0903668d
|
- NDOLoader: fix ASSIMP_BUILD_NO_NDO_IMPORTER guard.
|
2013-03-28 13:41:58 +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
|
4dbf539b44
|
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1147 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
|
2012-02-03 03:38:30 +00:00 |
|
aramis_acg
|
9edc0a9b8e
|
merge with git://github.com/tonttu/assimp.git
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1029 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
|
2011-06-09 14:29:32 +00:00 |
|
aramis_acg
|
e440fb2769
|
NDOLoader: improve reusability of some temporary vectors.
ColladaLoader: fix http://sourceforge.net/tracker/?func=detail&aid=3054873&group_id=226462&atid=1067632, thanks to Adario for the report.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@814 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
|
2010-09-11 19:44:06 +00:00 |
|
aramis_acg
|
81bebcd0ec
|
Add basic support for the IZWARE NENDO file format (extension: ndo). The loader has been tested with files in format version 1.0, 1.1 and 1.2. Materials and textures are read but ignored for now.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@791 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
|
2010-08-09 08:24:16 +00:00 |