Merge branch 'master' into new-file-detection

This commit is contained in:
Krishty
2021-05-05 00:09:42 +02:00
62 changed files with 1507 additions and 619 deletions
+1 -1
View File
@@ -685,7 +685,7 @@ void Parser::ParseLV3MapBlock(Texture &map) {
// Files with 'None' as map name are produced by
// an Maja to ASE exporter which name I forgot ..
ASSIMP_LOG_WARN("ASE: Skipping invalid map entry");
map.mMapName = "";
map.mMapName = std::string();
}
continue;