Merge branch 'development' into redcode/driller_removal

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

Code/Editor/GameEngine.cpp

@@ -35,7 +35,6 @@
 
 // CryCommon
 #include <CryCommon/INavigationSystem.h>
-#include <CryCommon/LyShine/ILyShine.h>
 #include <CryCommon/MainThreadRenderRequestBus.h>
 
 // Editor
@@ -595,13 +594,6 @@ void CGameEngine::SwitchToInEditor()
     // Enable accelerators.
     GetIEditor()->EnableAcceleratos(true);
 
-
-    // reset UI system
-    if (gEnv->pLyShine)
-    {
-        gEnv->pLyShine->Reset();
-    }
-
     // [Anton] - order changed, see comments for CGameEngine::SetSimulationMode
     //! Send event to switch out of game.
     GetIEditor()->GetObjectManager()->SendEvent(EVENT_OUTOFGAME);

Code/Editor/Plugins/EditorCommon/UiEditorDLLBus.h

@@ -1,41 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-#include <LyShine/UiBase.h>
-
-class UndoStack;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface class that the UI Editor needs to implement
-class UiEditorDLLInterface
-    : public AZ::EBusTraits
-{
-public: // member functions
-
-    virtual ~UiEditorDLLInterface(){}
-
-    //! Get the selected elements in the UiEditor
-    virtual LyShine::EntityArray GetSelectedElements() = 0;
-
-    //! Get the id of the active Canvas the UiEditor
-    virtual AZ::EntityId GetActiveCanvasId() = 0;
-
-    //! Get the active undo stack for the UI Editor
-    virtual UndoStack* GetActiveUndoStack() = 0;
-
-    //! Soft-switch to the given file.  Note that this should prompt for unsaved changes, etc.
-    virtual void OpenSourceCanvasFile(QString absolutePathToFile) = 0;
-
-public: // static member functions
-
-    static const char* GetUniqueName() { return "UiEditorDLLInterface"; }
-};
-
-typedef AZ::EBus<UiEditorDLLInterface> UiEditorDLLBus;

Code/Editor/Plugins/EditorCommon/editorcommon_files.cmake

@@ -13,7 +13,6 @@ set(FILES
     EditorCommonAPI.h
     ActionOutput.h
     ActionOutput.cpp
-    UiEditorDLLBus.h
     DockTitleBarWidget.cpp
     DockTitleBarWidget.h
     SaveUtilities/AsyncSaveRunner.h