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.7

Browse Source
This commit is contained in:
Wojtek Figat
2023-09-11 22:43:46 +02:00
parent 6bbc74caf2 762960bee1
commit fb488cbaf7
53 changed files with 1537 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Editor/CustomEditors/Editors/CultureInfoEditor.cs
View File

@@ -123,9 +123,9 @@ namespace FlaxEditor.CustomEditors.Editors
{
if (tree.IsLayoutLocked)
return;
root.LockChildrenRecursive();
tree.LockChildrenRecursive();
Utilities.Utils.UpdateSearchPopupFilter(root, searchBox.Text);
root.UnlockChildrenRecursive();
tree.UnlockChildrenRecursive();
menu.PerformLayout();
};
root.ExpandAll(true);

2
Source/Editor/CustomEditors/Editors/ModelInstanceEntryEditor.cs
View File

@@ -39,6 +39,8 @@ namespace FlaxEditor.CustomEditors.Editors
_entryIndex = entryIndex;
_modelInstance = modelInstance;
var slots = modelInstance.MaterialSlots;
if (slots == null || entryIndex >= slots.Length)
return;
if (entry.Material == slots[entryIndex].Material)
{
// Ensure that entry with default material set is set back to null

4
Source/Editor/CustomEditors/Editors/TagEditor.cs
View File

@@ -593,9 +593,9 @@ namespace FlaxEditor.CustomEditors.Editors
{
if (tree.IsLayoutLocked)
return;
root.LockChildrenRecursive();
tree.LockChildrenRecursive();
Utilities.Utils.UpdateSearchPopupFilter(root, searchBox.Text);
root.UnlockChildrenRecursive();
tree.UnlockChildrenRecursive();
menu.PerformLayout();
};