From 59568fb5c865b35bae640b6f85169f561bef9583 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Sun, 1 Jan 2023 23:17:23 +0100 Subject: [PATCH] Minor editor tweaks --- Source/Editor/Content/Items/JsonAssetItem.cs | 5 ++++- Source/Editor/Content/Proxy/JsonAssetProxy.cs | 4 ++-- Source/Editor/Windows/ContentWindow.ContextMenu.cs | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Source/Editor/Content/Items/JsonAssetItem.cs b/Source/Editor/Content/Items/JsonAssetItem.cs index 09deb4ace..2cd22e799 100644 --- a/Source/Editor/Content/Items/JsonAssetItem.cs +++ b/Source/Editor/Content/Items/JsonAssetItem.cs @@ -11,7 +11,10 @@ namespace FlaxEditor.Content /// public class JsonAssetItem : AssetItem { - private readonly SpriteHandle _thumbnail; + /// + /// Asset icon. + /// + protected SpriteHandle _thumbnail; /// /// Initializes a new instance of the class. diff --git a/Source/Editor/Content/Proxy/JsonAssetProxy.cs b/Source/Editor/Content/Proxy/JsonAssetProxy.cs index 8bfaae384..f526d12bc 100644 --- a/Source/Editor/Content/Proxy/JsonAssetProxy.cs +++ b/Source/Editor/Content/Proxy/JsonAssetProxy.cs @@ -127,7 +127,7 @@ namespace FlaxEditor.Content /// Generic Json assets proxy (supports all json assets that don't have dedicated proxy). /// /// - public sealed class GenericJsonAssetProxy : JsonAssetProxy + public class GenericJsonAssetProxy : JsonAssetProxy { /// public override string TypeName => typeof(JsonAsset).FullName; @@ -161,7 +161,7 @@ namespace FlaxEditor.Content /// Content proxy for a json assets of the given type that can be spawned in the editor. /// /// - public sealed class SpawnableJsonAssetProxy : JsonAssetProxy where T : new() + public class SpawnableJsonAssetProxy : JsonAssetProxy where T : new() { /// public override string Name { get; } = Utilities.Utils.GetPropertyNameUI(typeof(T).Name); diff --git a/Source/Editor/Windows/ContentWindow.ContextMenu.cs b/Source/Editor/Windows/ContentWindow.ContextMenu.cs index 89f13d6a3..06ad40e5c 100644 --- a/Source/Editor/Windows/ContentWindow.ContextMenu.cs +++ b/Source/Editor/Windows/ContentWindow.ContextMenu.cs @@ -155,7 +155,7 @@ namespace FlaxEditor.Windows var scriptType = new ScriptType(typeof(Script)); foreach (var type in Editor.CodeEditing.All.Get()) { - if (type.IsAbstract) + if (type.IsAbstract || type.Type == null) continue; if (actorType.IsAssignableFrom(type) || scriptType.IsAssignableFrom(type)) continue;