From 957d1360da152ad3012209241cf40f6cdde56cd7 Mon Sep 17 00:00:00 2001
From: sharmajs-amzn <82233357+sharmajs-amzn@users.noreply.github.com>
Date: Thu, 22 Apr 2021 12:54:36 -0700
Subject: [PATCH] Custom UV Stream Names in assimp (#210) (#243)

* Custom UV Stream Names in assimp
https://jira.agscollab.com/browse/LYN-2506
---
 .../FbxSceneBuilder/Importers/AssImpUvMapImporter.cpp  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpUvMapImporter.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpUvMapImporter.cpp
index 6d9189c1de..65e7c00d74 100644
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpUvMapImporter.cpp
+++ b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpUvMapImporter.cpp
@@ -32,7 +32,7 @@ namespace AZ
     {
         namespace FbxSceneBuilder
         {
-            const char* AssImpUvMapImporter::m_defaultNodeName = "UVMap";
+            const char* AssImpUvMapImporter::m_defaultNodeName = "UV";
 
             AssImpUvMapImporter::AssImpUvMapImporter()
             {
@@ -44,7 +44,7 @@ namespace AZ
                 SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
                 if (serializeContext)
                 {
-                    serializeContext->Class<AssImpUvMapImporter, SceneCore::LoadingComponent>()->Version(2); // LYN-2576
+                    serializeContext->Class<AssImpUvMapImporter, SceneCore::LoadingComponent>()->Version(3); // LYN-2506
                 }
             }
 
@@ -84,7 +84,13 @@ namespace AZ
                     AZStd::shared_ptr<SceneData::GraphData::MeshVertexUVData> uvMap =
                         AZStd::make_shared<AZ::SceneData::GraphData::MeshVertexUVData>();
                     uvMap->ReserveContainerSpace(vertexCount);
+
                     AZStd::string name(AZStd::string::format("%s%d", m_defaultNodeName, texCoordIndex));
+                    if (mesh->mTextureCoordsNames[texCoordIndex].length)
+                    {
+                        name = mesh->mTextureCoordsNames[texCoordIndex].C_Str();
+                    }
+
                     uvMap->SetCustomName(name.c_str());
 
                     for (int v = 0; v < mesh->mNumVertices; ++v)