From c8568a7cf2d7d59c11c7594c39f60fdf4ac86948 Mon Sep 17 00:00:00 2001 From: greerdv Date: Fri, 14 May 2021 13:51:02 +0100 Subject: [PATCH] add feedback from PR --- .../ToolsComponents/EditorNonUniformScaleComponent.cpp | 2 -- .../ToolsComponents/EditorNonUniformScaleComponentMode.cpp | 5 ----- .../ToolsComponents/EditorNonUniformScaleComponentMode.h | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.cpp index 03ad5cb3c7..62294aaed7 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.cpp @@ -16,8 +16,6 @@ #include #include -#include - namespace AzToolsFramework { namespace Components diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponentMode.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponentMode.cpp index 87f71f2912..b800247929 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponentMode.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponentMode.cpp @@ -28,15 +28,10 @@ namespace AzToolsFramework AZ::Transform worldFromLocal = AZ::Transform::CreateIdentity(); AZ::TransformBus::EventResult(worldFromLocal, m_entityComponentIdPair.GetEntityId(), &AZ::TransformBus::Events::GetWorldTM); - worldFromLocal.ExtractScale(); - m_manipulators = AZStd::make_unique(worldFromLocal); - m_manipulators->Register(g_mainManipulatorManagerId); - m_manipulators->SetAxes(AZ::Vector3::CreateAxisX(), AZ::Vector3::CreateAxisY(), AZ::Vector3::CreateAxisZ()); - m_manipulators->ConfigureView( 2.0f, AzFramework::ViewportColors::XAxisColor, AzFramework::ViewportColors::YAxisColor, AzFramework::ViewportColors::ZAxisColor); diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponentMode.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponentMode.h index 9b38067fdf..1169a4f13e 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponentMode.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponentMode.h @@ -31,7 +31,7 @@ namespace AzToolsFramework NonUniformScaleComponentMode& operator=(NonUniformScaleComponentMode&&) = delete; ~NonUniformScaleComponentMode(); - // EditorBaseComponentMode + // EditorBaseComponentMode overrides ... void Refresh() override; private: