From c546773521171deceb0843e06b114b71ff6c2b25 Mon Sep 17 00:00:00 2001
From: nvsickle <nvsickle@amazon.com>
Date: Wed, 30 Jun 2021 14:41:51 -0700
Subject: [PATCH] Fix duplicated camera entities in the Editor sharing a
 transform

Signed-off-by: nvsickle <nvsickle@amazon.com>
---
 Gems/Camera/Code/Source/EditorCameraComponent.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Gems/Camera/Code/Source/EditorCameraComponent.cpp b/Gems/Camera/Code/Source/EditorCameraComponent.cpp
index fed49fd3ca..97725581f3 100644
--- a/Gems/Camera/Code/Source/EditorCameraComponent.cpp
+++ b/Gems/Camera/Code/Source/EditorCameraComponent.cpp
@@ -26,8 +26,10 @@ namespace Camera
 
     void EditorCameraComponent::Activate()
     {
-        auto controllerConfig = m_controller.GetConfiguration();
+        // Ensure our Editor Entity ID is up-to-date to sync camera configurations between Edit & Game mode.
+        CameraComponentConfig controllerConfig = m_controller.GetConfiguration();
         controllerConfig.m_editorEntityId = GetEntityId().operator AZ::u64();
+        m_controller.SetConfiguration(controllerConfig);
 
         // Call base class activate, which in turn calls Activate on our controller.
         EditorCameraComponentBase::Activate();