Commit Graph

9 Commits (947429152f6bbbc12f639770128484c3c976a93b)

Author SHA1 Message Date
Alexander Gessler 4bf090e92c Merge branch 'master' of https://github.com/Madrich/assimp
Conflicts:
	code/ColladaParser.cpp
2015-03-16 23:04:16 +01:00
Alexander Gessler c59878e427 Merge branch 'master' of github.com:assimp/assimp
Conflicts:
	code/ColladaLoader.cpp
2015-03-15 00:18:39 +01:00
Madrich 8b1b12682f Add ExportProperties 2015-03-14 14:03:14 +01:00
Alexander Gessler aae0f7e7b1 3DSExporter: export materials first, then meshes. Our own importer requires this. 2015-02-15 22:12:19 +01:00
Turo Lamminen 570d02ff6e Silence more uninitialized variable warnings
These are false positives since aiMaterial::Get will have written to output
if it returns AI_SUCCESS but the compiler can't see that.
2015-02-13 13:15:26 +02:00
abma 56ddb4f4af fix some compile warnings:
- passing NULL to non-pointer
- unused vars
- unused function
- order of init
- parentheses
2014-08-17 23:28:00 +02:00
Alexander Gessler a07cde4a81 3DS Exporter: export scene hierarchy. 2014-07-23 22:08:35 +02:00
Alexander Gessler 026f32733d 3DS Export: fix texture export. 2014-07-23 20:14:32 +02:00
Alexander Gessler 6fde07f7e5 Initial implementation of 3DS Exporter. Hierarchy exporting and smoothing groups missing. 2014-07-23 18:27:22 +02:00