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

Fix rare crashes due to selection not being empty on play mode start

Browse Source
This commit is contained in:
Wojtek Figat
2021-08-20 10:51:27 +02:00
parent 3cb4abab0d
commit 09e2b737f0
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Editor/States/PlayingState.cs
View File

@@ -92,9 +92,13 @@ namespace FlaxEditor.States
{
Profiler.BeginEvent("PlayingState.CacheSelection");
_selectedObjects.Clear();
for (int i = 0; i < Editor.SceneEditing.Selection.Count; i++)
var selection = Editor.SceneEditing.Selection;
if (selection.Count != 0)
{
_selectedObjects.Add(Editor.SceneEditing.Selection[i].ID);
for (int i = 0; i < selection.Count; i++)
_selectedObjects.Add(selection[i].ID);
selection.Clear();
Editor.SceneEditing.OnSelectionChanged();
}
Profiler.EndEvent();
}
@@ -102,15 +106,16 @@ namespace FlaxEditor.States
private void RestoreSelection()
{
Profiler.BeginEvent("PlayingState.RestoreSelection");
var count = Editor.SceneEditing.Selection.Count;
Editor.SceneEditing.Selection.Clear();
var selection = Editor.SceneEditing.Selection;
var count = selection.Count;
selection.Clear();
for (int i = 0; i < _selectedObjects.Count; i++)
{
var node = SceneGraphFactory.FindNode(_selectedObjects[i]);
if (node != null)
Editor.SceneEditing.Selection.Add(node);
selection.Add(node);
}
if (Editor.SceneEditing.Selection.Count != count)
if (selection.Count != count)
Editor.SceneEditing.OnSelectionChanged();
Profiler.EndEvent();
}