From 7f1bcd91f5aac7c4daf949cab4662390895547b9 Mon Sep 17 00:00:00 2001 From: Ari Vuollet Date: Sun, 19 May 2024 14:03:42 +0300 Subject: [PATCH] Remove redundant asset waiting and reloading when saving materials --- Source/Editor/Windows/Assets/AssetEditorWindow.cs | 9 +-------- Source/Editor/Windows/Assets/MaterialWindow.cs | 1 - 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Source/Editor/Windows/Assets/AssetEditorWindow.cs b/Source/Editor/Windows/Assets/AssetEditorWindow.cs index f781d49dc..a05b1020e 100644 --- a/Source/Editor/Windows/Assets/AssetEditorWindow.cs +++ b/Source/Editor/Windows/Assets/AssetEditorWindow.cs @@ -459,8 +459,7 @@ namespace FlaxEditor.Windows.Assets /// True if failed, otherwise false. protected virtual bool SaveToOriginal() { - // Wait until temporary asset file be fully loaded - if (_asset.WaitForLoaded()) + if (_asset.LastLoadFailed) { Editor.LogError(string.Format("Cannot save asset {0}. Wait for temporary asset loaded failed.", _item.Path)); return true; @@ -494,12 +493,6 @@ namespace FlaxEditor.Windows.Assets return true; } - // Reload original asset - if (originalAsset) - { - originalAsset.Reload(); - } - // Refresh thumbnail _item.RefreshThumbnail(); diff --git a/Source/Editor/Windows/Assets/MaterialWindow.cs b/Source/Editor/Windows/Assets/MaterialWindow.cs index ef37fbe67..77758677d 100644 --- a/Source/Editor/Windows/Assets/MaterialWindow.cs +++ b/Source/Editor/Windows/Assets/MaterialWindow.cs @@ -355,7 +355,6 @@ namespace FlaxEditor.Windows.Assets Editor.LogError("Failed to save surface data"); } _asset.Reload(); - _asset.WaitForLoaded(); } }