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

Merge branch 'fix-type-editor-in-collection' of https://github.com/Tryibion/FlaxEngine into Tryibion-fix-type-editor-in-collection

Browse Source
This commit is contained in:
Wojtek Figat
2025-11-07 21:33:22 +01:00
parent b8b8b118c9 7377bad721
commit 547cf7f600
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Editor/CustomEditors/Editors/TypeEditor.cs
View File

@@ -104,7 +104,7 @@ namespace FlaxEditor.CustomEditors.Editors
public event Action<TypePickerControl> TypePickerValueChanged; public event Action<TypePickerControl> TypePickerValueChanged;
/// <summary> /// <summary>
/// The custom callback for types validation. Cane be used to implement a rule for types to pick. /// The custom callback for types validation. Can be used to implement a rule for types to pick.
/// </summary> /// </summary>
public Func<ScriptType, bool> CheckValid; public Func<ScriptType, bool> CheckValid;
@@ -353,7 +353,13 @@ namespace FlaxEditor.CustomEditors.Editors
} }
if (!string.IsNullOrEmpty(typeReference.CheckMethod)) if (!string.IsNullOrEmpty(typeReference.CheckMethod))
{ {
var parentType = ParentEditor.Values[0].GetType(); var parentEditor = ParentEditor;
// Find actual parent editor if parent editor is collection editor
while (parentEditor.GetType().IsAssignableTo(typeof(CollectionEditor)))
parentEditor = parentEditor.ParentEditor;
var parentType = parentEditor.Values[0].GetType();
var method = parentType.GetMethod(typeReference.CheckMethod, BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic); var method = parentType.GetMethod(typeReference.CheckMethod, BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic);
if (method != null) if (method != null)
{ {