From 50128e7a7c57cc0775f2b4c745af12828c374ad0 Mon Sep 17 00:00:00 2001
From: carlitosan <82187351+carlitosan@users.noreply.github.com>
Date: Thu, 3 Feb 2022 10:31:45 -0800
Subject: [PATCH] Fix for Lua properties not loading properly in
 play-in-editor. (#7369)

* debug information for lua script error

Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>

* actual fix for script properties not being loaded in play-in-editor unless modified or editor restarted

Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>

* remove debugging artifacts

Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
---
 .../AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp   | 1 +
 Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp
index dd156e0e40..bdff343e0c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp
@@ -783,6 +783,7 @@ namespace AzToolsFramework
             }
 
             EBUS_EVENT(ToolsApplicationEvents::Bus, InvalidatePropertyDisplay, Refresh_EntireTree);
+            ToolsApplicationRequests::Bus::Broadcast(&ToolsApplicationRequests::Bus::Events::AddDirtyEntity, GetEntityId());
         }
 
         void ScriptEditorComponent::LoadProperties()
diff --git a/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp b/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp
index f59f05b462..3127a99ef6 100644
--- a/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp
@@ -712,6 +712,7 @@ namespace ScriptCanvasEditor
         bool rollbackRequired = false;
         nodeEntity->Deactivate();
         RemoveNode(oldNode->GetEntityId());
+
         nodeEntity->RemoveComponent(oldNode);
 
         nodeEntity->AddComponent(newNode);