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

Fix script fields prefab diff showing and reverting with undo

Browse Source 
#3594
This commit is contained in:
Wojtek Figat
2025-08-28 22:52:46 +02:00
parent f3d375e356
commit ef7c7f2d30
1 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Source/Editor/CustomEditors/Dedicated/ActorEditor.cs
View File

@@ -10,8 +10,6 @@ using FlaxEditor.GUI;
using FlaxEditor.GUI.ContextMenu; using FlaxEditor.GUI.ContextMenu;
using FlaxEditor.GUI.Tree; using FlaxEditor.GUI.Tree;
using FlaxEditor.Scripting; using FlaxEditor.Scripting;
using FlaxEditor.Windows;
using FlaxEditor.Windows.Assets;
using FlaxEngine; using FlaxEngine;
using FlaxEngine.GUI; using FlaxEngine.GUI;
using FlaxEngine.Json; using FlaxEngine.Json;
@@ -304,7 +302,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
// Skip if no change detected // Skip if no change detected
var isRefEdited = editor.Values.IsReferenceValueModified; var isRefEdited = editor.Values.IsReferenceValueModified;
if (!isRefEdited && skipIfNotModified) if (!isRefEdited && skipIfNotModified && editor is not ScriptsEditor)
return null; return null;
TreeNode result = null; TreeNode result = null;
@@ -438,6 +436,15 @@ namespace FlaxEditor.CustomEditors.Dedicated
Presenter.BuildLayoutOnUpdate(); Presenter.BuildLayoutOnUpdate();
} }
private static void GetAllPrefabObjects(List<object> objects, Actor actor)
{
objects.Add(actor);
objects.AddRange(actor.Scripts);
var children = actor.Children;
foreach (var child in children)
GetAllPrefabObjects(objects, child);
}
private void OnDiffRevert(CustomEditor editor) private void OnDiffRevert(CustomEditor editor)
{ {
// Special case for removed Script from actor // Special case for removed Script from actor
@@ -471,7 +478,23 @@ namespace FlaxEditor.CustomEditors.Dedicated
return; return;
} }
editor.RevertToReferenceValue(); if (Presenter.Undo != null && Presenter.Undo.Enabled)
{
var thisActor = (Actor)Values[0];
var rootActor = thisActor.IsPrefabRoot ? thisActor : thisActor.GetPrefabRoot();
var prefabObjects = new List<object>();
GetAllPrefabObjects(prefabObjects, rootActor);
using (new UndoMultiBlock(Presenter.Undo, prefabObjects, "Revert to Prefab"))
{
editor.RevertToReferenceValue();
editor.RefreshInternal();
}
}
else
{
editor.RevertToReferenceValue();
editor.RefreshInternal();
}
} }
} }
} }