Integrating github/staging through commit 5f214be

2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
@@ -89,7 +89,7 @@ namespace AzToolsFramework
            const AzFramework::CameraState& cameraState,
            const ViewportInteraction::MouseInteraction& mouseInteraction);

-        // LUMBERYARD_DEPRECATED(LY-117150)
+        // O3DE_DEPRECATED(LY-117150)
        /// Check if the modifier key state has changed - if so we may need to refresh
        /// certain manipulator bounds.
        AZ_DEPRECATED(