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

2018-06-11 20:35:54 +02:00
parent 339cc2e951 5fedba3300
commit c659d682ae
277 changed files with 10793 additions and 3547 deletions
@@ -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;
            }