From 9e222681070b459013b4d3582a8aa98c96fd5717 Mon Sep 17 00:00:00 2001 From: greerdv Date: Fri, 7 May 2021 15:18:51 +0100 Subject: [PATCH] feedback from PR --- .../AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp index c3639b872e..bfb2ff4256 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp @@ -3730,7 +3730,7 @@ namespace AzToolsFramework AZ::s32 newComponentIndex = m_componentEditorsUsed - 1; // if there is a component id explicitly set as the most recently added, try to find it and make sure it is visible - if (m_newComponentId.has_value()) + if (m_newComponentId.has_value() && m_newComponentId.value() != AZ::InvalidComponentId) { AZ::ComponentId newComponentId = m_newComponentId.value(); for (AZ::s32 componentIndex = 0; componentIndex < m_componentEditorsUsed; ++componentIndex)