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

Merge branch 'FlaxEngine:master' into add_spline_edit_options

Browse Source
This commit is contained in:
Mr. Capybara
2023-09-03 09:25:14 -04:00
committed by GitHub
parent 79eddd07aa 36dca16991
commit 0a094ca916
72 changed files with 1862 additions and 716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Editor/CustomEditors/Editors/IBrushEditor.cs
View File

@@ -16,6 +16,7 @@ namespace FlaxEditor.CustomEditors.Editors
/// <inheritdoc />
protected override OptionType[] Options => new[]
{
new OptionType("null", null),
new OptionType("Texture", typeof(TextureBrush)),
new OptionType("Sprite", typeof(SpriteBrush)),
new OptionType("GPU Texture", typeof(GPUTextureBrush)),

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

@@ -158,7 +158,9 @@ namespace FlaxEditor.CustomEditors.Editors
if (comboBox.SelectedIndex != -1)
{
var option = _options[comboBox.SelectedIndex];
value = option.Creator(option.Type);
if (option.Type != null)
value = option.Creator(option.Type);
}
SetValue(value);
RebuildLayoutOnRefresh();