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

Fixes and tweaks

Browse Source
This commit is contained in:
Wojtek Figat
2021-02-12 10:57:45 +01:00
parent 5a23df6478
commit 80e2aee92b
10 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Content/Assets/Model.cpp
View File

@@ -104,7 +104,7 @@ protected:
{
ASSERT(_asset->_streamingTask == this);
_asset->_streamingTask = nullptr;
_asset.Unlink();
_asset = nullptr;
}
_dataLock.Release();

2
Source/Engine/Content/Assets/SkinnedModel.cpp
View File

@@ -97,7 +97,7 @@ protected:
{
ASSERT(_asset->_streamingTask == this);
_asset->_streamingTask = nullptr;
_asset.Unlink();
_asset = nullptr;
}
_dataLock.Release();

2
Source/Engine/Content/BinaryAsset.cpp
View File

@@ -491,7 +491,7 @@ protected:
void OnEnd() override
{
_dataLock.Release();
_asset.Unlink();
_asset = nullptr;
// Base
ContentLoadTask::OnEnd();

2
Source/Engine/Content/Loading/Tasks/LoadAssetDataTask.h
View File

@@ -82,7 +82,7 @@ protected:
void OnEnd() override
{
_dataLock.Release();
_asset.Unlink();
_asset = nullptr;
// Base
ContentLoadTask::OnEnd();

2
Source/Engine/Content/Loading/Tasks/LoadAssetTask.h
View File

@@ -68,7 +68,7 @@ protected:
void OnEnd() override
{
_asset.Unlink();
_asset = nullptr;
// Base
ContentLoadTask::OnEnd();

11
Source/Engine/Content/WeakAssetReference.h
View File

@@ -66,14 +66,6 @@ public:
return _asset ? _asset->GetOrCreateManagedInstance() : nullptr;
}
/// <summary>
/// Clears the asset reference.
/// </summary>
FORCE_INLINE void Unlink()
{
OnSet(nullptr);
}
/// <summary>
/// Gets the asset property value as string.
/// </summary>
@@ -103,7 +95,8 @@ protected:
{
ASSERT(_asset == asset);
Unload();
Unlink();
asset->OnUnloaded.Unbind<WeakAssetReferenceBase, &WeakAssetReferenceBase::OnAssetUnloaded>(this);
asset = nullptr;
}
};