Integrating latest from github/staging

Integrating up through commit 5e1bdae
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
@@ -75,8 +75,9 @@ namespace EMotionFX

        QString GetAssetSaveFolder() const
        {
-            QString dataDir = GetEMotionFX().GetAssetCacheFolder().c_str();
-            dataDir += "/TmpTestAssets";
+            auto testAssetsPath = AZ::IO::Path(GetEMotionFX().GetAssetCacheFolder()) / "TmpTestAssets";
+            QString dataDir = QString::fromUtf8(testAssetsPath.c_str(), aznumeric_cast<int>(testAssetsPath.Native().size()));
+            dataDir += "TmpTestAssets";

            if (!QDir(dataDir).exists())
            {