Merge remote-tracking branch 'origin/1.6' into 1.6

2023-03-31 19:38:05 +02:00
parent 29d0281932 20ce4642ea
commit 809a1041b3
9 changed files with 45 additions and 14 deletions
--- a/Source/Editor/Cooker/Steps/DeployDataStep.cpp
+++ b/Source/Editor/Cooker/Steps/DeployDataStep.cpp
@@ -115,7 +115,7 @@ bool DeployDataStep::Perform(CookingData& data)
                }
                for (String& version : versions)
                {
-                    version = StringUtils::GetFileName(version);
+                    version = String(StringUtils::GetFileName(version));
                    if (!version.StartsWith(TEXT("7.")))
                        version.Clear();
                }