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

Merge remote-tracking branch 'origin/master' into 1.6

Browse Source
This commit is contained in:
Wojtek Figat
2023-06-11 21:38:20 +02:00
parent 652f8ccb8d 5f8e5d44dc
commit 7140c4a2d8
20 changed files with 212 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -207,7 +207,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
node.Text = Utilities.Utils.GetPropertyNameUI(sceneObject.GetType().Name);
}
// Array Item
else if (editor.ParentEditor?.Values?.Type.IsArray ?? false)
else if (editor.ParentEditor is CollectionEditor)
{
node.Text = "Element " + editor.ParentEditor.ChildrenEditors.IndexOf(editor);
}
@@ -250,16 +250,14 @@ namespace FlaxEditor.CustomEditors.Dedicated
}
// Skip if no change detected
if (!editor.Values.IsReferenceValueModified && skipIfNotModified)
var isRefEdited = editor.Values.IsReferenceValueModified;
if (!isRefEdited && skipIfNotModified)
return null;
TreeNode result = null;
if (editor.ChildrenEditors.Count == 0)
if (editor.ChildrenEditors.Count == 0 || (isRefEdited && editor is CollectionEditor))
result = CreateDiffNode(editor);
bool isScriptEditorWithRefValue = editor is ScriptsEditor && editor.Values.HasReferenceValue;
for (int i = 0; i < editor.ChildrenEditors.Count; i++)
{
var child = ProcessDiff(editor.ChildrenEditors[i], !isScriptEditorWithRefValue);
@@ -267,7 +265,6 @@ namespace FlaxEditor.CustomEditors.Dedicated
{
if (result == null)
result = CreateDiffNode(editor);
result.AddChild(child);
}
}