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:
@@ -76,9 +76,10 @@ void GPUTasksContext::OnFrameBegin()
|
||||
{
|
||||
auto task = _tasksSyncing[i];
|
||||
auto state = task->GetState();
|
||||
if (EnumHasAllFlags(task->Flags, ObjectFlags::WasMarkedToDelete))
|
||||
state = TaskState::Finished;
|
||||
if (task->GetSyncPoint() <= _currentSyncPoint && state != TaskState::Finished)
|
||||
{
|
||||
// TODO: add stats counter and count performed jobs, print to log on exit.
|
||||
task->Sync();
|
||||
}
|
||||
if (state == TaskState::Failed || state == TaskState::Canceled)
|
||||
|
||||
Reference in New Issue
Block a user