GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wojtek Figat
2023-03-31 19:38:05 +02:00
parent 29d0281932 20ce4642ea
commit 809a1041b3
9 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Editor/Cooker/Steps/CompileScriptsStep.cpp
View File

@@ -95,8 +95,8 @@ bool CompileScriptsStep::DeployBinaries(CookingData& data, const String& path, c
Scripting::ProcessBuildInfoPath(e.NativePath, projectFolderPath);
Scripting::ProcessBuildInfoPath(e.ManagedPath, projectFolderPath);
e.NativePath = StringUtils::GetFileName(e.NativePath);
e.ManagedPath = StringUtils::GetFileName(e.ManagedPath);
e.NativePath = String(StringUtils::GetFileName(e.NativePath));
e.ManagedPath = String(StringUtils::GetFileName(e.ManagedPath));
LOG(Info, "Collecting binary module {0}", e.Name);
}

2
Source/Editor/Cooker/Steps/DeployDataStep.cpp
View File

@@ -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();
}