From a83b589e12438c8d900a14a8f9731b949e24835f Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Fri, 5 Apr 2024 16:43:18 +0200 Subject: [PATCH] Fix error when applying prefab changes with Spline #2384 --- Source/Editor/CustomEditors/CustomEditor.cs | 2 +- Source/Editor/CustomEditors/Dedicated/ActorEditor.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Editor/CustomEditors/CustomEditor.cs b/Source/Editor/CustomEditors/CustomEditor.cs index 48ada9150..7f540b767 100644 --- a/Source/Editor/CustomEditors/CustomEditor.cs +++ b/Source/Editor/CustomEditors/CustomEditor.cs @@ -536,7 +536,7 @@ namespace FlaxEditor.CustomEditors /// public void ClearReferenceValueAll() { - Values.ClearReferenceValue(); + Values?.ClearReferenceValue(); for (int i = 0; i < ChildrenEditors.Count; i++) { diff --git a/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs b/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs index 3699b8254..09b0e3a1f 100644 --- a/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs +++ b/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs @@ -164,7 +164,7 @@ namespace FlaxEditor.CustomEditors.Dedicated //Presenter.BuildLayoutOnUpdate(); // Better way is to just update the reference value using the new default instance of the prefab, created after changes apply - if (prefab && !prefab.WaitForLoaded()) + if (Values != null && prefab && !prefab.WaitForLoaded()) { var actor = (Actor)Values[0]; var prefabObjectId = actor.PrefabObjectID;