Merge remote-tracking branch 'upstream/main' into MoveDebugDisplayGlobalID

Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp

@@ -46,9 +46,7 @@
 #include <LmbrCentral/Rendering/MaterialOwnerBus.h>
 
 #include <IDisplayViewport.h>
-#include <Material/MaterialManager.h>
 #include <MathConversion.h>
-#include <Objects/StatObjValidator.h>
 #include <TrackView/TrackViewAnimNode.h>
 #include <ViewManager.h>
 #include <Viewport.h>
@@ -1096,56 +1094,3 @@ void CComponentEntityObject::DrawAccent(DisplayContext& dc)
         dc.DrawWireBox(box.min, box.max);
     }
 }
-
-void CComponentEntityObject::SetMaterial(CMaterial* material)
-{
-    AZ::Entity* entity = nullptr;
-    EBUS_EVENT_RESULT(entity, AZ::ComponentApplicationBus, FindEntity, m_entityId);
-    if (entity)
-    {
-        if (material)
-        {
-            EBUS_EVENT_ID(m_entityId, LmbrCentral::MaterialOwnerRequestBus, SetMaterial, material->GetMatInfo());
-        }
-        else
-        {
-            EBUS_EVENT_ID(m_entityId, LmbrCentral::MaterialOwnerRequestBus, SetMaterial, nullptr);
-        }
-    }
-
-    ValidateMeshStatObject();
-}
-
-CMaterial* CComponentEntityObject::GetMaterial() const
-{
-    _smart_ptr<IMaterial> material = nullptr;
-    EBUS_EVENT_ID_RESULT(material, m_entityId, LmbrCentral::MaterialOwnerRequestBus, GetMaterial);
-    return GetIEditor()->GetMaterialManager()->FromIMaterial(material);
-}
-
-CMaterial* CComponentEntityObject::GetRenderMaterial() const
-{
-    AZ::Entity* entity = nullptr;
-    EBUS_EVENT_RESULT(entity, AZ::ComponentApplicationBus, FindEntity, m_entityId);
-    if (entity)
-    {
-        _smart_ptr<IMaterial> material = nullptr;
-        EBUS_EVENT_ID_RESULT(material, m_entityId, LmbrCentral::MaterialOwnerRequestBus, GetMaterial);
-
-        if (material)
-        {
-            return GetIEditor()->GetMaterialManager()->LoadMaterial(material->GetName(), false);
-        }
-    }
-
-    return nullptr;
-}
-
-void CComponentEntityObject::ValidateMeshStatObject()
-{
-    IStatObj* statObj = GetIStatObj();
-    CMaterial* editorMaterial = GetMaterial();
-    CStatObjValidator statValidator;
-    statValidator.Validate(statObj, editorMaterial);
-}
-

Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h

@@ -79,9 +79,6 @@ public:
     CBaseObject* GetLinkParent() const override;
     XmlNodeRef Export(const QString& levelPath, XmlNodeRef& xmlNode) override;
     void DeleteEntity() override;
-    void SetMaterial(CMaterial* mtl) override;
-    CMaterial* GetMaterial() const override;
-    CMaterial* GetRenderMaterial() const override;
     void DrawDefault(DisplayContext& dc, const QColor& labelColor = QColor(255, 255, 255)) override;
     IStatObj* GetIStatObj() override;
     bool IsIsolated() const override;
@@ -184,8 +181,6 @@ protected:
 
     void DrawAccent(DisplayContext& dc);
 
-    void ValidateMeshStatObject();
-
     class EditorActionGuard
     {
     public:

Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp

@@ -30,7 +30,6 @@
 #include <AzFramework/Entity/EntityContextBus.h>
 #include <AzFramework/Physics/Material.h>
 #include <AzFramework/StringFunc/StringFunc.h>
-#include <AzFramework/API/AtomActiveInterface.h>
 #include <AzToolsFramework/API/EditorAssetSystemAPI.h>
 #include <AzToolsFramework/API/EntityCompositionRequestBus.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
@@ -162,13 +161,6 @@ void SandboxIntegrationManager::Setup()
     AzToolsFramework::EditorEvents::Bus::Handler::BusConnect();
     AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusConnect();
     AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusConnect();
-    // turn on the this debug display request bus implementation if no other implementation is active
-    if( !(AZ::Interface<AzFramework::AtomActiveInterface>::Get() && AzFramework::DebugDisplayRequestBus::HasHandlers()))
-    {
-        m_debugDisplayBusImplementationActive = true;
-        AzFramework::DebugDisplayRequestBus::Handler::BusConnect(
-            AzFramework::g_defaultSceneEntityDebugDisplayId);
-    }
 
     AzFramework::DisplayContextRequestBus::Handler::BusConnect();
     SetupFileExtensionMap();
@@ -302,12 +294,15 @@ void SandboxIntegrationManager::OnCatalogAssetAdded(const AZ::Data::AssetId& ass
 // operation writing to shared resource is queued on main thread.
 void SandboxIntegrationManager::OnCatalogAssetRemoved(const AZ::Data::AssetId& assetId, const AZ::Data::AssetInfo& assetInfo)
 {
+    bool isPrefabSystemEnabled = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(isPrefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+
     // Check to see if the removed slice asset has any instance in the level, then check if 
     // those dangling instances are directly under the root slice (not sub-slices). If yes,
     // detach them and save necessary information so they can be restored when their slice asset
     // comes back.
 
-    if (assetInfo.m_assetType == AZ::AzTypeInfo<AZ::SliceAsset>::Uuid())
+    if (!isPrefabSystemEnabled && assetInfo.m_assetType == AZ::AzTypeInfo<AZ::SliceAsset>::Uuid())
     {
         AZ::SliceComponent* rootSlice = nullptr;
         AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::BroadcastResult(rootSlice,

Code/Sandbox/Plugins/EditorCommon/QViewport.cpp

@@ -37,8 +37,6 @@
 #include <AzCore/Jobs/JobManager.h>
 #include <AzCore/Interface/Interface.h>
 
-#include <AzFramework/API/AtomActiveInterface.h>
-
 #include <AzQtComponents/Utilities/QtWindowUtilities.h>
 
 // Class to implement the WindowRequestBus::Handler instead of the QViewport class.
@@ -365,7 +363,7 @@ bool QViewport::CreateRenderContext()
 
     HWND windowHandle = reinterpret_cast<HWND>(QWidget::winId());
 
-    if( AZ::Interface<AzFramework::AtomActiveInterface>::Get() && m_renderContextCreated && windowHandle == m_lastHwnd)
+    if( m_renderContextCreated && windowHandle == m_lastHwnd)
     {
         // the hwnd has not changed, no need to destroy and recreate context (and swap chain etc)
         return false;
@@ -377,13 +375,10 @@ bool QViewport::CreateRenderContext()
     {
         m_renderContextCreated = true;
 
-        if (AZ::Interface<AzFramework::AtomActiveInterface>::Get())
-        {
-            m_viewportRequests.get()->BusConnect(windowHandle);
-            AzFramework::WindowSystemNotificationBus::Broadcast(&AzFramework::WindowSystemNotificationBus::Handler::OnWindowCreated, windowHandle);
+        m_viewportRequests.get()->BusConnect(windowHandle);
+        AzFramework::WindowSystemNotificationBus::Broadcast(&AzFramework::WindowSystemNotificationBus::Handler::OnWindowCreated, windowHandle);
 
-            m_lastHwnd = windowHandle;
-        }
+        m_lastHwnd = windowHandle;
 
         StorePreviousContext();
         GetIEditor()->GetEnv()->pRenderer->CreateContext(windowHandle);

Code/Sandbox/Plugins/PerforcePlugin/PerforceSourceControl.h

@@ -26,7 +26,7 @@ class CPerforceSourceControl
 public:
     // constructor
     CPerforceSourceControl() = default;
-    ~CPerforceSourceControl() = default;
+    virtual ~CPerforceSourceControl() = default;
 
     void Init();