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

Merge remote-tracking branch 'origin/master' into 1.8

Browse Source
This commit is contained in:
Wojtek Figat
2023-12-08 11:23:06 +01:00
parent f16406df8a 306dd43b18
commit 74f5d14ec9
155 changed files with 4997 additions and 2971 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1270,7 +1270,7 @@ bool CookAssetsStep::Perform(CookingData& data)
{
Array<CookingData::AssetTypeStatistics> assetTypes;
data.Stats.AssetStats.GetValues(assetTypes);
Sorting::QuickSort(assetTypes.Get(), assetTypes.Count());
Sorting::QuickSort(assetTypes);
LOG(Info, "");
LOG(Info, "Top assets types stats:");

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

@@ -119,7 +119,7 @@ bool DeployDataStep::Perform(CookingData& data)
if (!version.StartsWith(TEXT("8."))) // Check for major part of 8.0
version.Clear();
}
Sorting::QuickSort(versions.Get(), versions.Count());
Sorting::QuickSort(versions);
const String version = versions.Last();
FileSystem::NormalizePath(srcDotnet);
LOG(Info, "Using .Net Runtime {} at {}", version, srcDotnet);