Merge branch 'master' into issue_3398

2021-08-28 13:56:50 +02:00
parent 69051bbc2c 6841397798
commit df739f00dd
210 changed files with 1421 additions and 1329 deletions
--- a/code/AssetLib/3DS/3DSExporter.cpp
+++ b/code/AssetLib/3DS/3DSExporter.cpp
@@ -291,7 +291,7 @@ void Discreet3DSExporter::WriteMaterials() {
            ChunkWriter curChunk(writer, Discreet3DS::CHUNK_MAT_SPECULAR);
            WriteColor(color);
        }
-                
+
        if (mat.Get(AI_MATKEY_COLOR_AMBIENT, color) == AI_SUCCESS) {
            ChunkWriter curChunk(writer, Discreet3DS::CHUNK_MAT_AMBIENT);
            WriteColor(color);