From 9513ab8d1ee530ebc7fb7fdd79db2a092d174b69 Mon Sep 17 00:00:00 2001 From: greerdv Date: Mon, 22 Nov 2021 21:54:00 +0000 Subject: [PATCH] switch back to vector for button ids since there may not be a 1 to 1 mapping to modes in future Signed-off-by: greerdv --- Gems/PhysX/Code/Editor/ColliderComponentMode.cpp | 1 + Gems/PhysX/Code/Editor/ColliderComponentMode.h | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp index 76e687f26a..1f1cdd79fa 100644 --- a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp +++ b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp @@ -250,6 +250,7 @@ namespace PhysX &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::CreateCluster, AzToolsFramework::ViewportUi::Alignment::TopLeft); // create and register the buttons + m_buttonIds.resize(static_cast(SubMode::NumModes)); m_buttonIds[static_cast(SubMode::Offset)] = RegisterClusterButton(m_modeSelectionClusterId, "Move"); m_buttonIds[static_cast(SubMode::Rotation)] = RegisterClusterButton(m_modeSelectionClusterId, "Rotate"); m_buttonIds[static_cast(SubMode::Dimensions)] = RegisterClusterButton(m_modeSelectionClusterId, "Scale"); diff --git a/Gems/PhysX/Code/Editor/ColliderComponentMode.h b/Gems/PhysX/Code/Editor/ColliderComponentMode.h index 4c968bb87d..a756075513 100644 --- a/Gems/PhysX/Code/Editor/ColliderComponentMode.h +++ b/Gems/PhysX/Code/Editor/ColliderComponentMode.h @@ -66,8 +66,7 @@ namespace PhysX AzToolsFramework::ViewportUi::ClusterId m_modeSelectionClusterId; //!< Viewport UI cluster for changing sub mode. - //! Ids for the Viewport UI buttons for each mode. - AZStd::fixed_vector< AzToolsFramework::ViewportUi::ButtonId, static_cast(SubMode::NumModes)> m_buttonIds; + AZStd::vector m_buttonIds; //!< Ids for the Viewport UI buttons for each mode. AZ::Event::Handler m_modeSelectionHandler; //!< Event handler for sub mode changes.