Merge branch 'master' into fix-3ds-matrix

2021-05-01 11:34:33 +02:00
parent 260cc6bd26 f538b96e82
commit 78132d666f
52 changed files with 1319 additions and 442 deletions
--- a/code/AssetLib/3DS/3DSLoader.cpp
+++ b/code/AssetLib/3DS/3DSLoader.cpp
@@ -164,7 +164,7 @@ void Discreet3DSImporter::InternReadFile(const std::string &pFile,
    mRootNode->mHierarchyIndex = -1;
    mRootNode->mParent = nullptr;
    mMasterScale = 1.0f;
-    mBackgroundImage = "";
+    mBackgroundImage = std::string();
    bHasBG = false;
    bIsPrj = false;