From 67299419423c4e18a6fe8e1790b0030d18ff7e29 Mon Sep 17 00:00:00 2001
From: Guthrie Adams <guthadam@amazon.com>
Date: Mon, 25 Oct 2021 12:35:19 -0500
Subject: [PATCH] adding ifdef to compare loading vs creating material type
 assets

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
---
 .../Code/Source/RPI.Edit/Material/MaterialSourceData.cpp  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp
index 877e12ab2e..f1a41d0548 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp
@@ -193,6 +193,7 @@ namespace AZ
             MaterialAssetCreator materialAssetCreator;
             materialAssetCreator.SetElevateWarnings(elevateWarnings);
 
+#if 0
             MaterialTypeSourceData materialTypeSourceData;
             AZStd::string materialTypeSourcePath = AssetUtils::ResolvePathReference(materialSourceFilePath, m_materialType);
             if (!AZ::RPI::JsonUtils::LoadObjectFromFile(materialTypeSourcePath, materialTypeSourceData))
@@ -208,6 +209,13 @@ namespace AZ
             {
                 return Failure();
             }
+#else
+            auto materialTypeAsset = AssetUtils::LoadAsset<MaterialTypeAsset>(materialSourceFilePath, m_materialType);
+            if (!materialTypeAsset.IsSuccess())
+            {
+                return Failure();
+            }
+#endif
 
             materialAssetCreator.Begin(assetId, *materialTypeAsset.GetValue().Get(), includeMaterialPropertyNames);