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/XGL/XGLLoader.cpp
+++ b/code/AssetLib/XGL/XGLLoader.cpp
@@ -128,7 +128,7 @@ void XGLImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy

 	// check whether we can read from the file
 	if (stream.get() == NULL) {
-		throw DeadlyImportError("Failed to open XGL/ZGL file " + pFile + "");
+		throw DeadlyImportError("Failed to open XGL/ZGL file " + pFile);
 	}

 	// see if its compressed, if so uncompress it