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

Merge branch 'master' of https://github.com/Madrich/assimp

Browse Source 
Conflicts:
	code/ColladaParser.cpp
This commit is contained in:
Alexander Gessler
2015-03-16 23:04:16 +01:00
parent fdad4b51a1 c4eb04bb8c
commit 4bf090e92c
14 changed files with 387 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/3DSExporter.cpp
View File

@@ -144,7 +144,7 @@ namespace {
// ------------------------------------------------------------------------------------------------
// Worker function for exporting a scene to 3DS. Prototyped and registered in Exporter.cpp
void ExportScene3DS(const char* pFile, IOSystem* pIOSystem, const aiScene* pScene)
void ExportScene3DS(const char* pFile, IOSystem* pIOSystem, const aiScene* pScene, const ExportProperties* pProperties)
{
boost::shared_ptr<IOStream> outfile (pIOSystem->Open(pFile, "wb"));
if(!outfile) {