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

Fix synchronizing nested prefabs when adding new ObjectsLookupIdMapping

Browse Source 
#351
This commit is contained in:
Wojtek Figat
2021-03-18 00:04:58 +01:00
parent df497bf684
commit 42366ee66a
5 changed files with 50 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Editor/Viewport/PrefabWindowViewport.cs
View File

@@ -576,7 +576,7 @@ namespace FlaxEditor.Viewport
// Selected UI controls outline
for (var i = 0; i < _window.Selection.Count; i++)
{
if (_window.Selection[i].EditableObject is UIControl controlActor && controlActor.Control != null)
if (_window.Selection[i].EditableObject is UIControl controlActor && controlActor && controlActor.Control != null)
{
var control = controlActor.Control;
var bounds = Rectangle.FromPoints(control.PointToParent(this, Vector2.Zero), control.PointToParent(this, control.Size));

2
Source/Editor/Windows/GameWindow.cs
View File

@@ -296,7 +296,7 @@ namespace FlaxEditor.Windows
// Selected UI controls outline
for (var i = 0; i < Editor.Instance.SceneEditing.Selection.Count; i++)
{
if (Editor.Instance.SceneEditing.Selection[i].EditableObject is UIControl controlActor && controlActor.Control != null)
if (Editor.Instance.SceneEditing.Selection[i].EditableObject is UIControl controlActor && controlActor && controlActor.Control != null)
{
var control = controlActor.Control;
var bounds = Rectangle.FromPoints(control.PointToParent(_viewport, Vector2.Zero), control.PointToParent(_viewport, control.Size));