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

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

Browse Source 
# Conflicts:
#	README.md
This commit is contained in:
Wojtek Figat
2023-02-16 09:54:22 +01:00
parent c4b7f50609 ac368863aa
commit 30fa911832
47 changed files with 381 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Editor/Modules/SourceCodeEditing/CodeEditingModule.cs
View File

@@ -274,6 +274,7 @@ namespace FlaxEditor.Modules.SourceCodeEditing
{
ScriptsBuilder.ScriptsReload += OnScriptsReload;
ScriptsBuilder.ScriptsReloadEnd += OnScriptsReloadEnd;
ScriptsBuilder.ScriptsLoaded += OnScriptsLoaded;
Editor.Options.OptionsChanged += OnOptionsChanged;
// Add default code editors (in-build)
@@ -344,6 +345,7 @@ namespace FlaxEditor.Modules.SourceCodeEditing
ScriptsBuilder.ScriptsReload -= OnScriptsReload;
ScriptsBuilder.ScriptsReloadEnd -= OnScriptsReloadEnd;
ScriptsBuilder.ScriptsLoaded -= OnScriptsLoaded;
}
/// <summary>
@@ -379,6 +381,12 @@ namespace FlaxEditor.Modules.SourceCodeEditing
OnTypesChanged();
}
private void OnScriptsLoaded()
{
// Clear any state with engine-only types
ClearTypes();
}
private static bool IsTypeValidScriptingType(ScriptType t)
{
return !t.IsGenericType && !t.IsAbstract && !t.HasAttribute(typeof(HideInEditorAttribute), false);