Merge branch 'master' into fix-indent

2021-08-10 21:39:13 +02:00
parent f8fe3d1341 843e16868c
commit a16cd95b16
188 changed files with 1237 additions and 1205 deletions
--- a/code/AssetLib/3MF/D3MFImporter.cpp
+++ b/code/AssetLib/3MF/D3MFImporter.cpp
@@ -274,7 +274,7 @@ private:
        if (ret) {
            value = std::atoi(strValue.c_str());
            return true;
-        } 
+        }

        return false;
    }