Fix ContentDatabase not being loaded at the end of editor initialization

This commit is contained in:
2024-07-30 17:17:27 +03:00
committed by Ari Vuollet
parent 5fd64ead62
commit 4ddc765ee4

View File

@@ -90,6 +90,7 @@ namespace FlaxEditor.Modules
FlaxEngine.Json.JsonSerializer.Settings.Converters.Add(new AssetItemConverter()); FlaxEngine.Json.JsonSerializer.Settings.Converters.Add(new AssetItemConverter());
ScriptsBuilder.ScriptsReloadBegin += OnScriptsReloadBegin; ScriptsBuilder.ScriptsReloadBegin += OnScriptsReloadBegin;
ScriptsBuilder.ScriptsReloadEnd += OnScriptsReloadEnd;
} }
private void OnContentAssetDisposing(Asset asset) private void OnContentAssetDisposing(Asset asset)
@@ -1232,8 +1233,6 @@ namespace FlaxEditor.Modules
LoadProjects(Game.Project); LoadProjects(Game.Project);
} }
RebuildInternal();
Editor.ContentImporting.ImportFileEnd += (obj, failed) => Editor.ContentImporting.ImportFileEnd += (obj, failed) =>
{ {
var path = obj.ResultUrl; var path = obj.ResultUrl;
@@ -1356,6 +1355,11 @@ namespace FlaxEditor.Modules
_enableEvents = enabledEvents; _enableEvents = enabledEvents;
} }
private void OnScriptsReloadEnd()
{
RebuildInternal();
}
/// <inheritdoc /> /// <inheritdoc />
public override void OnUpdate() public override void OnUpdate()
{ {