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

Merge branch 'GoaLitiuM-release_prefab_fix'

Browse Source
This commit is contained in:
Wojtek Figat
2024-04-25 18:02:02 +02:00
parent 2c1b2d2b7c 16f1e8a3e1
commit 42de657629
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Engine/Level/Prefabs/Prefab.cpp
View File

@@ -8,9 +8,7 @@
#include "Engine/Level/Prefabs/PrefabManager.h" #include "Engine/Level/Prefabs/PrefabManager.h"
#include "Engine/Level/Actor.h" #include "Engine/Level/Actor.h"
#include "Engine/Threading/Threading.h" #include "Engine/Threading/Threading.h"
#if USE_EDITOR
#include "Engine/Scripting/Scripting.h" #include "Engine/Scripting/Scripting.h"
#endif
REGISTER_JSON_ASSET(Prefab, "FlaxEngine.Prefab", true); REGISTER_JSON_ASSET(Prefab, "FlaxEngine.Prefab", true);
@@ -163,10 +161,10 @@ Asset::LoadResult Prefab::loadAsset()
} }
} }
#if USE_EDITOR
// Register for scripts reload and unload (need to cleanup all user objects including scripts that may be attached to the default instance - it can be always restored) // Register for scripts reload and unload (need to cleanup all user objects including scripts that may be attached to the default instance - it can be always restored)
Scripting::ScriptsReloading.Bind<Prefab, &Prefab::DeleteDefaultInstance>(this);
Scripting::ScriptsUnload.Bind<Prefab, &Prefab::DeleteDefaultInstance>(this); Scripting::ScriptsUnload.Bind<Prefab, &Prefab::DeleteDefaultInstance>(this);
#if USE_EDITOR
Scripting::ScriptsReloading.Bind<Prefab, &Prefab::DeleteDefaultInstance>(this);
#endif #endif
return LoadResult::Ok; return LoadResult::Ok;
@@ -174,10 +172,10 @@ Asset::LoadResult Prefab::loadAsset()
void Prefab::unload(bool isReloading) void Prefab::unload(bool isReloading)
{ {
#if USE_EDITOR
// Unlink // Unlink
Scripting::ScriptsReloading.Unbind<Prefab, &Prefab::DeleteDefaultInstance>(this);
Scripting::ScriptsUnload.Unbind<Prefab, &Prefab::DeleteDefaultInstance>(this); Scripting::ScriptsUnload.Unbind<Prefab, &Prefab::DeleteDefaultInstance>(this);
#if USE_EDITOR
Scripting::ScriptsReloading.Unbind<Prefab, &Prefab::DeleteDefaultInstance>(this);
#endif #endif
// Base // Base