@@ -1,7 +1,6 @@
|
|||||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.IO;
|
|
||||||
using FlaxEditor.Scripting;
|
using FlaxEditor.Scripting;
|
||||||
using FlaxEngine;
|
using FlaxEngine;
|
||||||
using FlaxEngine.Utilities;
|
using FlaxEngine.Utilities;
|
||||||
|
|||||||
@@ -292,5 +292,17 @@ namespace FlaxEditor.CustomEditors.Editors
|
|||||||
_isRefreshing = false;
|
_isRefreshing = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Deinitialize()
|
||||||
|
{
|
||||||
|
if (_validator != null)
|
||||||
|
{
|
||||||
|
_validator.OnDestroy();
|
||||||
|
_validator = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
base.Deinitialize();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -898,9 +898,13 @@ namespace FlaxEditor.CustomEditors.Editors
|
|||||||
base.Draw();
|
base.Draw();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
public override void OnDestroy()
|
public override void OnDestroy()
|
||||||
{
|
{
|
||||||
_pickerValidator.OnDestroy();
|
_pickerValidator.OnDestroy();
|
||||||
|
_pickerValidator = null;
|
||||||
|
|
||||||
|
base.OnDestroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool ValidateActors(ActorNode node)
|
private bool ValidateActors(ActorNode node)
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ namespace FlaxEditor.GUI
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initializes a new instance of the <see cref="AssetPicker"/> class.
|
/// Initializes a new instance of the <see cref="AssetPicker"/> class.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="assetType">The assets types that this picker accepts.</param>
|
/// <param name="assetType">The asset types that this picker accepts.</param>
|
||||||
/// <param name="location">The control location.</param>
|
/// <param name="location">The control location.</param>
|
||||||
public AssetPicker(ScriptType assetType, Float2 location)
|
public AssetPicker(ScriptType assetType, Float2 location)
|
||||||
: base(location, new Float2(DefaultIconSize + ButtonsOffset + ButtonsSize, DefaultIconSize))
|
: base(location, new Float2(DefaultIconSize + ButtonsOffset + ButtonsSize, DefaultIconSize))
|
||||||
|
|||||||
Reference in New Issue
Block a user