Merge branch 'development' into cmake/warn_format_security

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	cmake/Platform/Common/Clang/Configurations_clang.cmake

Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h

@@ -40,11 +40,13 @@ namespace AzManipulatorTestFramework
         float DeviceScalingFactor() override;
     private:
         // ViewportInteractionRequestBus ...
-        bool GridSnappingEnabled();
-        float GridSize();
-        bool ShowGrid();
-        bool AngleSnappingEnabled();
-        float AngleStep();
+        bool GridSnappingEnabled() override;
+        float GridSize() override;
+        bool ShowGrid() override;
+        bool AngleSnappingEnabled() override;
+        float AngleStep() override;
+        float ManipulatorLineBoundWidth() override;
+
         AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition);
     private:
         AZStd::unique_ptr<NullDebugDisplayRequests> m_nullDebugDisplayRequests;

Code/Framework/AzManipulatorTestFramework/Source/DirectManipulatorViewportInteraction.cpp

@@ -34,7 +34,7 @@ namespace AzManipulatorTestFramework
             ViewportInteractionInterface* viewportInteraction, AZStd::shared_ptr<CustomManipulatorManager> manipulatorManager);
 
         // ManipulatorManagerInterface ...
-        void ConsumeMouseInteractionEvent(const MouseInteractionEvent& event);
+        void ConsumeMouseInteractionEvent(const MouseInteractionEvent& event) override;
         AzToolsFramework::ManipulatorManagerId GetId() const override;
         bool ManipulatorBeingInteracted() const override;
 

Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp

@@ -62,6 +62,11 @@ namespace AzManipulatorTestFramework
         return m_angularStep;
     }
 
+    float ViewportInteraction::ManipulatorLineBoundWidth()
+    {
+        return 0.1f;
+    }
+
     AzFramework::ScreenPoint ViewportInteraction::ViewportWorldToScreen(const AZ::Vector3& worldPosition)
     {
         return AzFramework::WorldToScreen(worldPosition, m_cameraState);