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

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

Browse Source 
Conflicts:
	code/ColladaLoader.cpp
This commit is contained in:
Alexander Gessler
2015-03-15 00:18:39 +01:00
parent 3080c26a60 ad9d178f0a
commit c59878e427
96 changed files with 3067 additions and 985 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/3DSExporter.cpp
View File

@@ -294,7 +294,7 @@ void Discreet3DSExporter::WriteMaterials()
WriteColor(color);
}
aiShadingMode shading_mode;
aiShadingMode shading_mode = aiShadingMode_Flat;
if (mat.Get(AI_MATKEY_SHADING_MODEL, shading_mode) == AI_SUCCESS) {
ChunkWriter chunk(writer, Discreet3DS::CHUNK_MAT_SHADING);