Merge branch 'master' into new-file-detection

2021-05-05 00:09:42 +02:00
parent 0f3e6e2941 be85eac703
commit b79b84d34e
62 changed files with 1507 additions and 619 deletions
--- a/code/AssetLib/Irr/IRRLoader.cpp
+++ b/code/AssetLib/Irr/IRRLoader.cpp
@@ -845,7 +845,7 @@ void IRRImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy

 	// Check whether we can read from the file
 	if (file.get() == nullptr) {
-		throw DeadlyImportError("Failed to open IRR file " + pFile + "");
+		throw DeadlyImportError("Failed to open IRR file " + pFile);
 	}

 	// Construct the irrXML parser