From 7650683902d01ea5d66c6c2d44c6cf9107af02a8 Mon Sep 17 00:00:00 2001
From: rhhong <rhhong@amazon.com>
Date: Tue, 17 Aug 2021 16:17:27 -0700
Subject: [PATCH] Defer the nodeWindowPlugin reinit to main thread update. Set
 the actor file name through actor asset.

Signed-off-by: rhhong <rhhong@amazon.com>
---
 .../Source/NodeWindow/NodeWindowPlugin.cpp            | 11 ++++++++++-
 .../Source/NodeWindow/NodeWindowPlugin.h              |  4 ++++
 .../Code/Source/Integration/Assets/ActorAsset.cpp     |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeWindowPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeWindowPlugin.cpp
index 6b7beb20de..4629e8dc54 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeWindowPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeWindowPlugin.cpp
@@ -327,7 +327,16 @@ namespace EMStudio
 
     void NodeWindowPlugin::OnActorReady([[maybe_unused]] EMotionFX::Actor* actor)
     {
-        ReInit();
+        m_reinitRequested = true;
+    }
+
+    void NodeWindowPlugin::ProcessFrame([[maybe_unused]] float timePassedInSeconds)
+    {
+        if (m_reinitRequested)
+        {
+            ReInit();
+            m_reinitRequested = false;
+        }
     }
 
     //-----------------------------------------------------------------------------------------
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeWindowPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeWindowPlugin.h
index 157486df10..4c530fffdc 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeWindowPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeWindowPlugin.h
@@ -60,6 +60,8 @@ namespace EMStudio
         EMStudioPlugin* Clone() override;
         void ReInit();
 
+        void ProcessFrame(float timePassedInSeconds) override;
+
     public slots:
         void OnNodeChanged();
         void VisibilityChanged(bool isVisible);
@@ -87,5 +89,7 @@ namespace EMStudio
 
         AZStd::unique_ptr<ActorInfo>        m_actorInfo;
         AZStd::unique_ptr<NodeInfo>         m_nodeInfo;
+
+        bool m_reinitRequested = false;
     };
 } // namespace EMStudio
diff --git a/Gems/EMotionFX/Code/Source/Integration/Assets/ActorAsset.cpp b/Gems/EMotionFX/Code/Source/Integration/Assets/ActorAsset.cpp
index 5b546c1155..64117fa814 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Assets/ActorAsset.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Assets/ActorAsset.cpp
@@ -63,6 +63,7 @@ namespace EMotionFX
                 &actorSettings,
                 "");
 
+            assetData->m_emfxActor->SetFileName(asset.GetHint().c_str());
             assetData->m_emfxActor->Finalize();
 
             // Clear out the EMFX raw asset data.