Merge remote-tracking branch 'origin/1.5' into dotnet7

2023-01-02 10:37:04 +01:00
parent e48b642101 59568fb5c8
commit d3cdca6b33
29 changed files with 543 additions and 143 deletions
--- 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;