Merge branch 'development' into cmake/SPEC-2513_w4018

2021-08-06 11:57:55 -07:00
parent db942e2cf5 ca3bc3d343
commit f4164ef3a3
259 changed files with 2934 additions and 1126 deletions
@@ -91,7 +91,7 @@ namespace
        void ViewportInfoStatusUpdated(int newIndex);

    private:
-        void OnViewportInfoDisplayStateChanged(AZ::AtomBridge::ViewportInfoDisplayState state)
+        void OnViewportInfoDisplayStateChanged(AZ::AtomBridge::ViewportInfoDisplayState state) override
        {
            emit ViewportInfoStatusUpdated(static_cast<int>(state));
        }