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

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

Browse Source 
# Conflicts:
#	Source/Engine/Content/Storage/FlaxStorage.cpp
#	global.json
This commit is contained in:
Wojtek Figat
2026-03-26 23:44:33 +01:00
parent b347cd2f54 a48ce78733
commit eab7794e3b
96 changed files with 1094 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Engine/Content/Storage/FlaxStorage.cpp
View File

@@ -286,14 +286,14 @@ FlaxStorage::LockData FlaxStorage::LockSafe()
uint32 FlaxStorage::GetRefCount() const
{
return (uint32)Platform::AtomicRead((intptr*)&_refCount);
return (uint32)Platform::AtomicRead(&_refCount);
}
bool FlaxStorage::ShouldDispose() const
{
return Platform::AtomicRead((intptr*)&_refCount) == 0 &&
Platform::AtomicRead((intptr*)&_chunksLock) == 0 &&
Platform::GetTimeSeconds() - _lastRefLostTime >= 0.5; // TTL in seconds
return Platform::AtomicRead(&_refCount) == 0 &&
Platform::AtomicRead(&_chunksLock) == 0 &&
Platform::GetTimeSeconds() - _lastRefLostTime >= ContentStorageManager::UnusedStorageLifetime.GetTotalSeconds();
}
uint32 FlaxStorage::GetMemoryUsage() const