Merge remote-tracking branch 'origin/master' into 1.13
# Conflicts: # Flax.flaxproj # Source/Engine/Level/Actors/StaticModel.cpp # Source/Engine/Level/Prefabs/Prefab.cpp # Source/Engine/Tools/ModelTool/ModelTool.cpp
This commit is contained in:
@@ -272,6 +272,7 @@ String Asset::ToString() const
|
||||
|
||||
void Asset::OnDeleteObject()
|
||||
{
|
||||
PROFILE_CPU_NAMED("Asset.Unload");
|
||||
ASSERT(IsInMainThread());
|
||||
|
||||
// Send event to the gameplay so it can release handle to this asset
|
||||
|
||||
Reference in New Issue
Block a user