From 1137c2d09d17e8a95ea642c5863b885ce1137c95 Mon Sep 17 00:00:00 2001
From: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue, 22 Jun 2021 18:09:06 -0500
Subject: [PATCH 1/2] Fix importing normals on PBR materials

Some normals are flagged as "NORMAL_CAMERA" by AssImp, so if we can't find NORMALS we fallback to looking for NORMAL_CAMERA
---
 Code/Tools/SceneAPI/SDKWrapper/AssImpMaterialWrapper.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Code/Tools/SceneAPI/SDKWrapper/AssImpMaterialWrapper.cpp b/Code/Tools/SceneAPI/SDKWrapper/AssImpMaterialWrapper.cpp
index 61b911d922..2bb1ee9b6e 100644
--- a/Code/Tools/SceneAPI/SDKWrapper/AssImpMaterialWrapper.cpp
+++ b/Code/Tools/SceneAPI/SDKWrapper/AssImpMaterialWrapper.cpp
@@ -225,6 +225,10 @@ namespace AZ
                 {
                     m_assImpMaterial->GetTexture(aiTextureType_NORMALS, textureIndex, &absTexturePath);
                 }
+                else if (m_assImpMaterial->GetTextureCount(aiTextureType_NORMAL_CAMERA) > textureIndex)
+                {
+                    m_assImpMaterial->GetTexture(aiTextureType_NORMAL_CAMERA, textureIndex, &absTexturePath);
+                }
                 break;
             case MaterialMapType::Metallic:
                 if (m_assImpMaterial->GetTextureCount(aiTextureType_METALNESS) > textureIndex)

From e88823397d13de325cec9a208108a6e0dd9589db Mon Sep 17 00:00:00 2001
From: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed, 23 Jun 2021 17:34:29 -0500
Subject: [PATCH 2/2] Set blend mode to lerp when importing a color map

---
 .../Code/Source/Material/MaterialConverterSystemComponent.cpp    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Gems/Atom/Feature/Common/Code/Source/Material/MaterialConverterSystemComponent.cpp b/Gems/Atom/Feature/Common/Code/Source/Material/MaterialConverterSystemComponent.cpp
index a2db63cf78..218adc8ed6 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/MaterialConverterSystemComponent.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/MaterialConverterSystemComponent.cpp
@@ -83,6 +83,7 @@ namespace AZ
             {
                 anyPBRInUse = true;
                 handleTexture("baseColor", SceneAPI::DataTypes::IMaterialData::TextureMapType::BaseColor);
+                sourceData.m_properties["baseColor"]["textureBlendMode"].m_value = AZStd::string("Lerp");
             }
             else
             {