Merging dev latest

Signed-off-by: AMZN-Gene <[email protected]>

Author: AMZN-Gene

AutomatedTesting/Gem/Resources/LegacyLogoLauncher.bmp

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bbd314f41b90bc9cba384d86eed865568343cbd332568f74c8ca39a08bc43836
+size 1200056

AutomatedTesting/Gem/Resources/Splash.bmp

@@ -135,8 +135,6 @@ AZ_POP_DISABLE_WARNING
 
 #include "EditorToolsApplication.h"
 
-#include "Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h"
-
 #include <AzToolsFramework/Undo/UndoSystem.h>
 
 

AutomatedTesting/Levels/Graphics/SilhouetteTest/SilhouetteTest.prefab

@@ -74,6 +74,7 @@
 #include "Include/IObjectManager.h"
 #include "LayoutWnd.h"
 #include "MainWindow.h"
+#include "Objects/EntityObject.h"
 #include "Objects/DisplayContext.h"
 #include "Objects/ObjectManager.h"
 #include "ProcessInfo.h"
@@ -82,9 +83,6 @@
 #include "ViewPane.h"
 #include "ViewportManipulatorController.h"
 
-// ComponentEntityEditorPlugin
-#include <Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h>
-
 // Atom
 #include <Atom/RPI.Public/RenderPipeline.h>
 #include <Atom/RPI.Public/View.h>

Code/Editor/CryEdit.cpp

@@ -24,9 +24,9 @@
 #include "Util/Image.h"
 #include "ObjectManagerLegacyUndo.h"
 #include "Include/HitContext.h"
-#include "Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h"
 
 #include <AzCore/Console/Console.h>
+#include <AzCore/RTTI/BehaviorContext.h>
 #include <AzToolsFramework/Viewport/ViewportMessages.h>
 #include <AzToolsFramework/ComponentMode/EditorComponentModeBus.h>
 

Code/Editor/EditorViewportWidget.cpp

@@ -6,6 +6,8 @@
  *
  */
 
+#pragma once
+
 #if !defined(Q_MOC_RUN)
 #include <Editor/Core/QtEditorApplication.h>
 #include <AzToolsFramework/Entity/EditorEntityContextBus.h>

Code/Editor/Objects/ObjectManager.cpp

@@ -6,6 +6,8 @@
  *
  */
 
+#pragma once
+
 #include <Editor/Core/QtEditorApplication.h>
 
 namespace Editor

Code/Editor/Platform/Linux/Editor/Core/QtEditorApplication_linux.h

@@ -6,6 +6,8 @@
  *
  */
 
+#pragma once
+
 #include <Editor/Core/QtEditorApplication.h>
 
 namespace Editor

Code/Editor/Platform/Mac/Editor/Core/QtEditorApplication_mac.h

@@ -42,38 +42,4 @@ ly_add_target(
 )
 
 ly_add_dependencies(Editor ComponentEntityEditorPlugin)
-set_property(GLOBAL APPEND PROPERTY LY_EDITOR_PLUGINS $<TARGET_FILE_NAME:Legacy::ComponentEntityEditorPlugin>)
-
-################################################################################
-# Tests
-################################################################################
-if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
-
-    ly_add_target(
-        NAME ComponentEntityEditorPlugin.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
-        NAMESPACE Legacy
-        AUTOMOC
-        FILES_CMAKE
-            componententityeditorplugin_test_files.cmake
-        INCLUDE_DIRECTORIES
-            PRIVATE
-                .
-        BUILD_DEPENDENCIES
-            PRIVATE
-                3rdParty::Qt::Core
-                3rdParty::Qt::Gui
-                3rdParty::Qt::Widgets
-                AZ::AzTest
-                AZ::AzToolsFramework
-                AZ::AzToolsFrameworkTestCommon
-                Legacy::CryCommon
-                Legacy::EditorLib
-                Gem::LmbrCentral.Editor
-        RUNTIME_DEPENDENCIES
-            Gem::LmbrCentral.Editor
-    )
-    ly_add_googletest(
-        NAME Legacy::ComponentEntityEditorPlugin.Tests
-        LABELS REQUIRES_tiaf
-    )
-endif()
+set_property(GLOBAL APPEND PROPERTY LY_EDITOR_PLUGINS $<TARGET_FILE_NAME:Legacy::ComponentEntityEditorPlugin>)