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

Fix crash when spawning actor from asyc thread into the SceneObject

Browse Source 
#2033
This commit is contained in:
Wojtek Figat
2023-12-07 11:50:24 +01:00
parent 83ef9791d4
commit eb7d5e5df3
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Engine/Level/Actor.cpp
View File

@@ -239,14 +239,8 @@ const Guid& Actor::GetSceneObjectId() const
void Actor::SetParent(Actor* value, bool worldPositionsStays, bool canBreakPrefabLink) void Actor::SetParent(Actor* value, bool worldPositionsStays, bool canBreakPrefabLink)
{ {
// Check if value won't change
if (_parent == value) if (_parent == value)
return; return;
if (IsDuringPlay() && !IsInMainThread())
{
LOG(Error, "Editing scene hierarchy is only allowed on a main thread.");
return;
}
#if USE_EDITOR || !BUILD_RELEASE #if USE_EDITOR || !BUILD_RELEASE
if (Is<Scene>()) if (Is<Scene>())
{ {
@@ -265,6 +259,13 @@ void Actor::SetParent(Actor* value, bool worldPositionsStays, bool canBreakPrefa
// Detect it actor is not in a game but new parent is already in a game (we should spawn it) // Detect it actor is not in a game but new parent is already in a game (we should spawn it)
const bool isBeingSpawned = !IsDuringPlay() && newScene && value->IsDuringPlay(); const bool isBeingSpawned = !IsDuringPlay() && newScene && value->IsDuringPlay();
// Actors system doesn't support editing scene hierarchy from multiple threads
if (!IsInMainThread() && (IsDuringPlay() || isBeingSpawned))
{
LOG(Error, "Editing scene hierarchy is only allowed on a main thread.");
return;
}
// Handle changing scene (unregister from it) // Handle changing scene (unregister from it)
const bool isSceneChanging = prevScene != newScene; const bool isSceneChanging = prevScene != newScene;
if (prevScene && isSceneChanging && wasActiveInTree) if (prevScene && isSceneChanging && wasActiveInTree)