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

Merge branch 'GoaLitiuM-custom_asset_hotreload'

Browse Source
This commit is contained in:
Wojtek Figat
2023-06-20 22:01:07 +02:00
parent 64a7985376 67dad80e15
commit 2a109e50fb
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Engine/Scripting/Scripting.cpp
View File

@@ -640,9 +640,9 @@ void Scripting::Reload(bool canTriggerSceneReload)
MCore::GC::WaitForPendingFinalizers(); MCore::GC::WaitForPendingFinalizers();
// Destroy objects from game assemblies (eg. not released objects that might crash if persist in memory after reload) // Destroy objects from game assemblies (eg. not released objects that might crash if persist in memory after reload)
const auto flaxModule = GetBinaryModuleFlaxEngine();
_objectsLocker.Lock(); _objectsLocker.Lock();
{ {
const auto flaxModule = GetBinaryModuleFlaxEngine();
for (auto i = _objectsDictionary.Begin(); i.IsNotEnd(); ++i) for (auto i = _objectsDictionary.Begin(); i.IsNotEnd(); ++i)
{ {
auto obj = i->Value; auto obj = i->Value;
@@ -657,6 +657,15 @@ void Scripting::Reload(bool canTriggerSceneReload)
} }
_objectsLocker.Unlock(); _objectsLocker.Unlock();
// Release assets sourced from game assemblies
for (auto asset : Content::GetAssets())
{
if (asset->GetTypeHandle().Module == flaxModule)
continue;
asset->DeleteObjectNow();
}
// Unload all game modules // Unload all game modules
LOG(Info, "Unloading game binary modules"); LOG(Info, "Unloading game binary modules");
auto modules = BinaryModule::GetModules(); auto modules = BinaryModule::GetModules();