From cdb38251d86d089871fe6d290d6052e7bfb687fa Mon Sep 17 00:00:00 2001
From: santorac <55155825+santorac@users.noreply.github.com>
Date: Tue, 16 Nov 2021 17:19:44 -0800
Subject: [PATCH] Fixed an issue that prevented saving child materials with
 explicitly empty texture properties.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
---
 .../Code/Source/Util/MaterialPropertyUtil.cpp        | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp
index 91e3d5c2f0..3ffd8efa6e 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp
@@ -188,20 +188,26 @@ namespace AtomToolsFramework
         if (propertyDefinition.m_dataType == AZ::RPI::MaterialPropertyDataType::Image)
         {
             AZStd::string imagePath;
+            AZ::Data::AssetId imageAssetId;
 
             if (propertyValue.Is<AZ::Data::Asset<AZ::RPI::ImageAsset>>())
             {
                 const auto& imageAsset = propertyValue.GetValue<AZ::Data::Asset<AZ::RPI::ImageAsset>>();
-                imagePath = AZ::RPI::AssetUtils::GetSourcePathByAssetId(imageAsset.GetId());
+                imageAssetId = imageAsset.GetId();
             }
 
             if (propertyValue.Is<AZ::Data::Instance<AZ::RPI::Image>>())
             {
                 const auto& image = propertyValue.GetValue<AZ::Data::Instance<AZ::RPI::Image>>();
-                imagePath = image ? AZ::RPI::AssetUtils::GetSourcePathByAssetId(image->GetAssetId()) : "";
+                if (image)
+                {
+                    imageAssetId = image->GetAssetId();
+                }
             }
+            
+            imagePath = AZ::RPI::AssetUtils::GetSourcePathByAssetId(imageAssetId);
 
-            if (imagePath.empty())
+            if (imageAssetId.IsValid() && imagePath.empty())
             {
                 AZ_Error("AtomToolsFramework", false, "Image asset could not be found for property: '%s'.", propertyId.GetCStr());
                 return false;