From b829c08f758b8132e98f1ede8e81c96a9ff6ddfb Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Fri, 11 Feb 2022 10:12:57 -0800 Subject: [PATCH] Fixed build error. Added error message if material type file JSON import fails. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- .../RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp index 1af62d1247..f4653a076e 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp @@ -97,6 +97,12 @@ namespace AZ importSettings.m_importer = &jsonImporter; importSettings.m_loadedJsonPath = filePath; AZ::JsonSerializationResult::ResultCode result = AZ::JsonSerialization::ResolveImports(document->GetObject(), document->GetAllocator(), importSettings); + if (result.GetProcessing() != AZ::JsonSerializationResult::Processing::Completed) + { + AZ_Error("MaterialUtils", false, "%s", result.ToString(filePath).c_str()); + return AZ::Failure(); + } + if (importedFiles) { *importedFiles = importSettings.m_importer->GetImportedFiles();