Merge pull request #1498 from aws-lumberyard-dev/Helios_LYN-3723-FixPBRNormalMapImport

[LYN-3723] Fix Stingray PBR normal map import

Code/Tools/SceneAPI/SDKWrapper/AssImpMaterialWrapper.cpp

@@ -220,6 +220,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)

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
             {