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

Fix regression from 3e7368b1cb to remove scene lock when spawning actors in async

Browse Source 
#1743
This commit is contained in:
Wojtek Figat
2023-10-19 15:29:26 +02:00
parent a989173e2d
commit 0ea00a09ca
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Level/Level.cpp
View File

@@ -975,6 +975,7 @@ bool Level::loadScene(rapidjson_flax::Value& data, int32 engineBuild, Scene** ou
SceneObject** objects = sceneObjects->Get(); SceneObject** objects = sceneObjects->Get();
if (context.Async) if (context.Async)
{ {
ScenesLock.Unlock(); // Unlock scenes from Main Thread so Job Threads can use it to safely setup actors hierarchy (see Actor::Deserialize)
JobSystem::Execute([&](int32 i) JobSystem::Execute([&](int32 i)
{ {
i++; // Start from 1. at index [0] was scene i++; // Start from 1. at index [0] was scene
@@ -992,6 +993,7 @@ bool Level::loadScene(rapidjson_flax::Value& data, int32 engineBuild, Scene** ou
else else
SceneObjectsFactory::HandleObjectDeserializationError(stream); SceneObjectsFactory::HandleObjectDeserializationError(stream);
}, objectsCount - 1); }, objectsCount - 1);
ScenesLock.Lock();
} }
else else
{ {