Merge branch 'master' into fix-scale-msg

2021-05-04 08:13:12 +02:00
parent 7cd6ddad8a 79802ad836
commit 39522178aa
59 changed files with 1333 additions and 483 deletions
--- a/code/Common/BaseImporter.cpp
+++ b/code/Common/BaseImporter.cpp
@@ -271,7 +271,7 @@ std::string BaseImporter::GetExtension(const std::string &file) {

    // no file extension at all
    if (pos == std::string::npos) {
-        return "";
+        return std::string();
    }

    // thanks to Andy Maloney for the hint