Merge pull request #5486 from aws-lumberyard-dev/viewport/ghi_5239

Fix for Issue #5239: Component Edit Mode does not disable Entity Inspector interaction
2021-11-10 14:50:36 +00:00
parent 027b0f86ae 0e3df14ea2
commit adf3357176
1 changed files with 3 additions and 1 deletions
@@ -606,6 +606,7 @@ namespace AzToolsFramework

        AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusConnect(
            AzToolsFramework::GetEntityContextId());
+        ViewportEditorModeNotificationsBus::Handler::BusConnect(GetEntityContextId());
    }

    EntityPropertyEditor::~EntityPropertyEditor()
@@ -618,7 +619,8 @@ namespace AzToolsFramework
        AZ::EntitySystemBus::Handler::BusDisconnect();
        EditorEntityContextNotificationBus::Handler::BusDisconnect();
        AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusDisconnect();
-
+        ViewportEditorModeNotificationsBus::Handler::BusDisconnect();
+        
        for (auto& entityId : m_overrideSelectedEntityIds)
        {
            DisconnectFromEntityBuses(entityId);