Merge branch 'develop' into LYN-4700

Signed-off-by: igarri <igarri@amazon.com>
2021-08-06 10:18:26 +01:00
parent 6fb250c66b 70ae5c2d40
commit 9d2b99b558
322 changed files with 1656 additions and 1274 deletions
@@ -42,7 +42,7 @@ public:
        AzToolsFramework::EditorEvents::Bus::Handler::BusConnect();
    }

-    ~ListenerForShowAssetEditorEvent()
+    ~ListenerForShowAssetEditorEvent() override
    {
        AzToolsFramework::EditorEvents::Bus::Handler::BusDisconnect();
    }