Merge branch 'master' into msvc2019fix

This commit is contained in:
Kim Kulling
2021-03-12 15:49:41 +01:00
committed by GitHub
38 changed files with 338 additions and 411 deletions

View File

@@ -137,7 +137,7 @@ bool EmbedTexturesProcess::addTexture(aiScene* pScene, std::string path) const {
pTexture->pcData = imageContent;
auto extension = path.substr(path.find_last_of('.') + 1u);
std::transform(extension.begin(), extension.end(), extension.begin(), ToLower<char> );
extension = ai_str_tolower(extension);
if (extension == "jpeg") {
extension = "jpg";
}