From 6fc056cba2d6a7824f0401cd48c8018b2a85fe9b Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Tue, 11 Jun 2024 15:56:32 +0200 Subject: [PATCH] Add default material for Radial Menu control #2678 --- Content/Engine/DefaultRadialMenu.flax | 3 +++ Source/Engine/UI/GUI/Special/RadialMenu.cs | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 Content/Engine/DefaultRadialMenu.flax diff --git a/Content/Engine/DefaultRadialMenu.flax b/Content/Engine/DefaultRadialMenu.flax new file mode 100644 index 000000000..1159e4719 --- /dev/null +++ b/Content/Engine/DefaultRadialMenu.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7c517175501d1b41143a9d2d81950bf0d91d0556cfebca5784e7ef2c4ba94cf +size 20340 diff --git a/Source/Engine/UI/GUI/Special/RadialMenu.cs b/Source/Engine/UI/GUI/Special/RadialMenu.cs index 2ffe8006a..55722e8f7 100644 --- a/Source/Engine/UI/GUI/Special/RadialMenu.cs +++ b/Source/Engine/UI/GUI/Special/RadialMenu.cs @@ -38,8 +38,7 @@ namespace FlaxEngine.GUI if (_material == value) return; _material = value; - Object.DestroyNow(_materialInstance); - _materialInstance = null; + Object.Destroy(ref _materialInstance); _materialIsDirty = true; } } @@ -174,6 +173,7 @@ namespace FlaxEngine.GUI ForegroundColor = style.BackgroundHighlighted; SelectionColor = style.BackgroundSelected; } + _material = Content.LoadAsyncInternal("Engine/DefaultRadialMenu"); } ///