From 7dc4d8438b008ce914734638eb2bd46621107b9d Mon Sep 17 00:00:00 2001
From: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Sat, 12 Jun 2021 20:33:50 -0500
Subject: [PATCH] Fix non-bone transforms setting the wrong matrix variable

(cherry picked from commit 838a8b47da73e50fca4ea9ee5abc7c33250bf25d)
---
 .../FbxSceneBuilder/Importers/AssImpTransformImporter.cpp     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.cpp
index dc59f59147..3e22bfc671 100644
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.cpp
+++ b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.cpp
@@ -85,7 +85,7 @@ namespace AZ
                     //__debugbreak();
                 }
 
-                aiMatrix4x4 combinedTransform;
+                //aiMatrix4x4 combinedTransform;
                 DataTypes::MatrixType finalMat;
 
                 if (isBone)
@@ -171,7 +171,7 @@ namespace AZ
                 }
                 else
                 {
-                    combinedTransform = GetConcatenatedLocalTransform(currentNode);
+                    finalMat = AssImpSDKWrapper::AssImpTypeConverter::ToTransform(GetConcatenatedLocalTransform(currentNode));
                 }
 
                 //DataTypes::MatrixType localTransform = AssImpSDKWrapper::AssImpTypeConverter::ToTransform(combinedTransform);