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

Fix error when loading surface from not yet loaded asset

Browse Source
This commit is contained in:
Wojtek Figat
2022-05-06 18:30:49 +02:00
parent 4cedd0f30c
commit 78d6fe6b50
9 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Engine/Content/Asset.cpp
View File

@@ -350,7 +350,7 @@ namespace ContentLoadingManagerImpl
extern ConcurrentTaskQueue<ContentLoadTask> Tasks;
};
bool Asset::WaitForLoaded(double timeoutInMilliseconds)
bool Asset::WaitForLoaded(double timeoutInMilliseconds) const
{
// This function is used many time when some parts of the engine need to wait for asset loading end (it may fail but has to end).
// But it cannot be just a simple active-wait loop.
@@ -376,7 +376,7 @@ bool Asset::WaitForLoaded(double timeoutInMilliseconds)
// If running on a main thread we can flush asset `Loaded` event
if (IsInMainThread())
{
Content::tryCallOnLoaded(this);
Content::tryCallOnLoaded((Asset*)this);
}
return false;
@@ -467,7 +467,7 @@ bool Asset::WaitForLoaded(double timeoutInMilliseconds)
// If running on a main thread we can flush asset `Loaded` event
if (IsInMainThread() && IsLoaded())
{
Content::tryCallOnLoaded(this);
Content::tryCallOnLoaded((Asset*)this);
}
return _isLoaded == 0;