From 3151e47722741da632dd7ecf7cc5d3fc36671458 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Sun, 29 Dec 2024 23:21:26 +0100 Subject: [PATCH] Fix missing material instance load failure when parameters load fails --- Source/Engine/Content/Assets/MaterialInstance.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Source/Engine/Content/Assets/MaterialInstance.cpp b/Source/Engine/Content/Assets/MaterialInstance.cpp index 537fe0243..13d46db09 100644 --- a/Source/Engine/Content/Assets/MaterialInstance.cpp +++ b/Source/Engine/Content/Assets/MaterialInstance.cpp @@ -218,7 +218,11 @@ Asset::LoadResult MaterialInstance::load() auto baseMaterial = Content::LoadAsync(baseMaterialId); // Load parameters - Params.Load(&headerStream); + if (Params.Load(&headerStream)) + { + LOG(Warning, "Cannot load material parameters."); + return LoadResult::CannotLoadData; + } if (baseMaterial && !baseMaterial->WaitForLoaded()) {