From 6b9ecc69c949d6e6e23481b4589550918da9e632 Mon Sep 17 00:00:00 2001 From: karlberg Date: Fri, 7 May 2021 20:45:35 -0700 Subject: [PATCH] two more unit test touchpoints where core systems may not be initialized --- .../AzFramework/Components/TransformComponent.cpp | 6 +++++- .../AzToolsFramework/ToolsComponents/TransformComponent.cpp | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp b/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp index 866f0cc6d2..fb2d3d35bf 100644 --- a/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp +++ b/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp @@ -833,7 +833,11 @@ namespace AzFramework EBUS_EVENT_PTR(m_notificationBus, AZ::TransformNotificationBus, OnTransformChanged, m_localTM, m_worldTM); m_transformChangedEvent.Signal(m_localTM, m_worldTM); - AZ::Interface::Get()->OnTransformUpdated(GetEntity()); + AzFramework::IEntityBoundsUnion* boundsUnion = AZ::Interface::Get(); + if (boundsUnion != nullptr) + { + boundsUnion->OnTransformUpdated(GetEntity()); + } } void TransformComponent::ComputeWorldTM() diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp index 81684e62ea..ac5f1136f5 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp @@ -268,7 +268,11 @@ namespace AzToolsFramework GetEntityId(), &TransformNotification::OnTransformChanged, localTM, worldTM); m_transformChangedEvent.Signal(localTM, worldTM); - AZ::Interface::Get()->OnTransformUpdated(GetEntity()); + AzFramework::IEntityBoundsUnion* boundsUnion = AZ::Interface::Get(); + if (boundsUnion != nullptr) + { + boundsUnion->OnTransformUpdated(GetEntity()); + } } }