From db55f5ea3f838aed0767568480377b8581f66149 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Thu, 4 Feb 2021 22:59:13 +0100 Subject: [PATCH] Fix crash when changing prefab root object --- .../Editor/Viewport/Previews/PrefabPreview.cs | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/Source/Editor/Viewport/Previews/PrefabPreview.cs b/Source/Editor/Viewport/Previews/PrefabPreview.cs index d0ed8a0c2..a9f5a7d22 100644 --- a/Source/Editor/Viewport/Previews/PrefabPreview.cs +++ b/Source/Editor/Viewport/Previews/PrefabPreview.cs @@ -72,7 +72,28 @@ namespace FlaxEditor.Viewport.Previews public Actor Instance { get => _instance; - internal set => _instance = value; + internal set + { + if (_instance == value) + return; + + if (_instance) + { + if (customControlLinked != null) + { + customControlLinked.Parent = null; + customControlLinked = null; + } + Task.RemoveCustomActor(_instance); + } + + _instance = value; + + if (_instance) + { + Task.AddCustomActor(_instance); + } + } } ///