diff --git a/GlitchyEditor/src/EditorContentManager.bf b/GlitchyEditor/src/EditorContentManager.bf index 1a3357c..d25d9d8 100644 --- a/GlitchyEditor/src/EditorContentManager.bf +++ b/GlitchyEditor/src/EditorContentManager.bf @@ -972,16 +972,22 @@ class EditorContentManager : IContentManager { TreeNode assetNode = TrySilent!(AssetHierarchy.GetNodeFromAssetHandle(handle)); - _assetConverter.QueueForProcessing(assetNode->AssetFile, isBlocking); - var isBlocking; isBlocking = true; + _assetConverter.QueueForProcessing(assetNode->AssetFile, isBlocking); + if (isBlocking) { asset = _assetCache.GetCacheEntry(handle); - Log.EngineLogger.Assert(asset != null, "Failed to load asset."); + //Log.EngineLogger.Assert(asset != null, "Failed to load asset."); + + if (asset == null) + { + Log.EngineLogger.Error($"Failed to load Asset \"{assetNode->Path}\" (Handle: {handle})"); + return new NewPlaceholderAsset(handle, .Error); + } } else {