From fe661bc159fbb8d6759286021e4f081fcca6b41a Mon Sep 17 00:00:00 2001
From: Benjamin Jillich <jillich@amazon.com>
Date: Tue, 20 Jul 2021 16:27:52 +0200
Subject: [PATCH] Register tangents rule for mesh groups, so users can add it
 to the scene settings

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
---
 .../SceneCore/DataTypes/GraphData/IMeshVertexTangentData.h   | 3 +--
 .../SceneAPI/SceneData/GraphData/MeshVertexBitangentData.cpp | 1 -
 .../SceneAPI/SceneData/GraphData/MeshVertexTangentData.cpp   | 1 -
 Code/Tools/SceneAPI/SceneData/ManifestMetaInfoHandler.cpp    | 5 +++++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexTangentData.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexTangentData.h
index 3264bcf45d..ffeeedf9fe 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexTangentData.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexTangentData.h
@@ -25,8 +25,7 @@ namespace AZ
             enum class TangentSpace
             {
                 FromSourceScene = 0,
-                MikkT           = 1,
-                EMotionFX       = 2
+                MikkT           = 1
             };
 
             enum class BitangentMethod
diff --git a/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexBitangentData.cpp b/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexBitangentData.cpp
index 183288a470..faa9bf457e 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexBitangentData.cpp
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexBitangentData.cpp
@@ -34,7 +34,6 @@ namespace AZ
                         ->Method("GetBitangent", &MeshVertexBitangentData::GetBitangent)
                         ->Method("GetBitangentSetIndex", &MeshVertexBitangentData::GetBitangentSetIndex)
                         ->Method("GetTangentSpace", &MeshVertexBitangentData::GetTangentSpace)
-                        ->Enum<(int)SceneAPI::DataTypes::TangentSpace::EMotionFX>("EMotionFX")
                         ->Enum<(int)SceneAPI::DataTypes::TangentSpace::FromSourceScene>("FromSourceScene")
                         ->Enum<(int)SceneAPI::DataTypes::TangentSpace::MikkT>("MikkT");
                 }
diff --git a/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexTangentData.cpp b/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexTangentData.cpp
index 41e8bd9f65..9f27f4eb44 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexTangentData.cpp
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexTangentData.cpp
@@ -34,7 +34,6 @@ namespace AZ
                         ->Method("GetTangent", &MeshVertexTangentData::GetTangent)
                         ->Method("GetTangentSetIndex", &MeshVertexTangentData::GetTangentSetIndex)
                         ->Method("GetTangentSpace", &MeshVertexTangentData::GetTangentSpace)
-                        ->Enum<(int)SceneAPI::DataTypes::TangentSpace::EMotionFX>("EMotionFX")
                         ->Enum<(int)SceneAPI::DataTypes::TangentSpace::FromSourceScene>("FromSourceScene")
                         ->Enum<(int)SceneAPI::DataTypes::TangentSpace::MikkT>("MikkT");
                 }
diff --git a/Code/Tools/SceneAPI/SceneData/ManifestMetaInfoHandler.cpp b/Code/Tools/SceneAPI/SceneData/ManifestMetaInfoHandler.cpp
index 760221983e..a135ec5073 100644
--- a/Code/Tools/SceneAPI/SceneData/ManifestMetaInfoHandler.cpp
+++ b/Code/Tools/SceneAPI/SceneData/ManifestMetaInfoHandler.cpp
@@ -23,6 +23,7 @@
 #include <SceneAPI/SceneData/Rules/MaterialRule.h>
 #include <SceneAPI/SceneData/Rules/StaticMeshAdvancedRule.h>
 #include <SceneAPI/SceneData/Rules/SkeletonProxyRule.h>
+#include <SceneAPI/SceneData/Rules/TangentsRule.h>
 #include <SceneAPI/SceneData/Rules/SkinMeshAdvancedRule.h>
 #include <SceneAPI/SceneData/Rules/SkinRule.h>
 #include <SceneAPI/SceneData/Rules/CoordinateSystemRule.h>
@@ -82,6 +83,10 @@ namespace AZ
                     {
                         modifiers.push_back(azrtti_typeid<CoordinateSystemRule>());
                     }
+                    if (existingRules.find(SceneData::TangentsRule::TYPEINFO_Uuid()) == existingRules.end())
+                    {
+                        modifiers.push_back(SceneData::TangentsRule::TYPEINFO_Uuid());
+                    }
                 }
                 else if (target.RTTI_IsTypeOf(DataTypes::ISkinGroup::TYPEINFO_Uuid()))
                 {