Merge branch 'master' into review

2018-06-16 09:10:41 +02:00
parent a03ab068be e3bfd08445
commit 3e45acbf4e
281 changed files with 10818 additions and 3554 deletions
--- a/code/XFileImporter.cpp
+++ b/code/XFileImporter.cpp
@@ -592,7 +592,7 @@ void XFileImporter::ConvertMaterials( aiScene* pScene, std::vector<XFile::Materi
            }

            if( oldMat.sceneIndex == SIZE_MAX ) {
-                DefaultLogger::get()->warn( format() << "Could not resolve global material reference \"" << oldMat.mName << "\"" );
+                ASSIMP_LOG_WARN_F( "Could not resolve global material reference \"", oldMat.mName, "\"" );
                oldMat.sceneIndex = 0;
            }