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

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

Browse Source
This commit is contained in:
Wojtek Figat
2025-03-07 23:41:02 +01:00
parent 0c0f128585 ca153e70ab
commit 5bdbbb6d38
42 changed files with 1215 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Platform/Base/PlatformBase.cpp
View File

@@ -272,7 +272,7 @@ bool PlatformBase::Is64BitApp()
int32 PlatformBase::GetCacheLineSize()
{
return Platform::GetCPUInfo().CacheLineSize;
return (int32)Platform::GetCPUInfo().CacheLineSize;
}
void PlatformBase::Fatal(const StringView& msg, void* context, FatalErrorType error)

2
Source/Engine/Platform/Base/PlatformBase.h
View File

@@ -394,7 +394,7 @@ public:
/// [Deprecated in v1.10]
/// </summary>
/// <returns>The cache line size.</returns>
API_PROPERTY() DEPRECATED("Use CPUInfo.CacheLineSize instead") static int32 GetCacheLineSize();
API_PROPERTY() DEPRECATED("Use CacheLineSize field from CPUInfo.") static int32 GetCacheLineSize();
/// <summary>
/// Gets the current memory stats.