From acff45446a068bcce2ba88cb711b1b9da3a0ae65 Mon Sep 17 00:00:00 2001
From: Robin <rbarrand@amazon.com>
Date: Wed, 29 Sep 2021 10:04:49 -0700
Subject: [PATCH] Resolve PR comments.

Signed-off-by: Robin <rbarrand@amazon.com>
---
 .../Material/MaterialTypeSourceData.cpp       | 19 ++++++++++++-------
 .../RPI.Reflect/Material/MaterialAsset.cpp    |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp
index 48b2c43435..6fe4fa3412 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp
@@ -311,16 +311,21 @@ namespace AZ
 
             // Set materialtype version and add each version update object into MaterialTypeAsset.
             materialTypeAssetCreator.SetVersion(m_version);
-            for (const auto& versionUpdate : m_versionUpdates)
             {
-                MaterialVersionUpdate materialVersionUpdate;
-                for (const auto& action : versionUpdate.m_actions)
+            const AZ::Name rename = AZ::Name{ "rename" };
+            const AZ::Name from = AZ::Name{ "from" };
+            const AZ::Name to = AZ::Name{ "to" };
+                for (const auto& versionUpdate : m_versionUpdates)
                 {
-                    materialVersionUpdate.AddAction(MaterialVersionUpdate::Action(AZ::Name{ "rename" }, {
-                        { AZ::Name{ "from" }, AZ::Name{ action.m_renameFrom } },
-                        { AZ::Name{ "to" }, AZ::Name{ action.m_renameTo } } }));
+                    MaterialVersionUpdate materialVersionUpdate;
+                    for (const auto& action : versionUpdate.m_actions)
+                    {
+                        materialVersionUpdate.AddAction(MaterialVersionUpdate::Action(rename, {
+                            { from, AZ::Name{ action.m_renameFrom } },
+                            { to, AZ::Name{ action.m_renameTo } } }));
+                    }
+                    materialTypeAssetCreator.AddVersionUpdate(versionUpdate.m_toVersion, materialVersionUpdate);
                 }
-                materialTypeAssetCreator.AddVersionUpdate(versionUpdate.m_toVersion, materialVersionUpdate);
             }
 
             // Used to gather all the UV streams used in this material type from its shaders in alphabetical order.
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp
index c838ab2794..cc460f4234 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp
@@ -195,7 +195,7 @@ namespace AZ
 
         void MaterialAsset::ApplyVersionUpdates()
         {
-            for (int i = 0; i < static_cast<int>(m_materialTypeAsset->GetVersion() - m_materialTypeVersion); ++i)
+            for (int i = 0; i < aznumeric_cast<int>(m_materialTypeAsset->GetVersion() - m_materialTypeVersion); ++i)
             {
                 const auto& versionUpdate = m_materialTypeAsset->GetMaterialVersionUpdate(m_materialTypeVersion + i + 1);