From 0f699cfd470701f21dc6c2e498e9cde9dfa5361d Mon Sep 17 00:00:00 2001
From: Benjamin Jillich <43751992+amzn-jillich@users.noreply.github.com>
Date: Wed, 2 Jun 2021 08:35:59 +0200
Subject: [PATCH] [LYN-4157] EMotionFX: Adding/removing colliders to/from
 ragdoll and saving the actor crashes the Editor (#1055)

The actor dirty flag was set to true even after saving the asset info which resulted in the save dirty files dialog to appear providing the user to save the actor another time, just after saving it which is confusing. This might have led to rendering an already deleted actor and the crash. Though, I was not able to stably reproduce the issue and can't reproduce it anymore after this fix.
---
 .../Tools/EMotionStudio/EMStudioSDK/Source/Commands.cpp       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Commands.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Commands.cpp
index 294f4c7c99..46760af8f0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Commands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Commands.cpp
@@ -218,6 +218,10 @@ namespace EMStudio
         }
 
         const bool saveResult = manifest.SaveToFile(manifestFilename.c_str());
+        if (saveResult)
+        {
+            actor->SetDirtyFlag(false);
+        }
 
         // Source Control: Add file in case it did not exist before (when saving it the first time).
         if (saveResult && !fileExisted)