Merge pull request #1703 from aws-lumberyard-dev/nvsickle/FixCameraSync

Fix duplicated camera entities in the Editor sharing a transform
2021-06-30 16:59:56 -07:00
parent 7030f663f5 c546773521
commit e15519603a
1 changed files with 3 additions and 1 deletions
@@ -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();