Merge branch 'develop' into LYN-4700

Signed-off-by: igarri <igarri@amazon.com>

Code/Editor/EditorViewportWidget.cpp

@@ -472,6 +472,12 @@ void EditorViewportWidget::Update()
         m_Camera.SetZRange(cameraState.m_nearClip, cameraState.m_farClip);
     }
 
+    // Ensure the FOV matches our internally stored setting if we're using the Editor camera
+    if (!m_viewEntityId.IsValid() && !GetIEditor()->IsInGameMode())
+    {
+        SetFOV(GetFOV());
+    }
+
     // Reset the camera update flag now that we're finished updating our viewport context
     m_updateCameraPositionNextTick = false;
 
@@ -2624,8 +2630,6 @@ void EditorViewportWidget::DestroyRenderContext()
 //////////////////////////////////////////////////////////////////////////
 void EditorViewportWidget::SetDefaultCamera()
 {
-    // Ensure the FOV matches our internally stored setting
-    SetFOV(GetFOV());
     if (IsDefaultCamera())
     {
         return;

Code/Editor/ToolBox.cpp

@@ -321,42 +321,13 @@ bool CToolBoxManager::SetMacroTitle(int index, const QString& title, bool bToolb
 }
 
 //////////////////////////////////////////////////////////////////////////
-void CToolBoxManager::Load(ActionManager* actionManager)
+void CToolBoxManager::Load([[maybe_unused]] ActionManager* actionManager)
 {
     Clear();
 
     QString path;
     GetSaveFilePath(path);
     Load(path, nullptr, true, nullptr);
-
-    if (actionManager)
-    {
-        auto engineSourceAssetPath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / "Assets";
-        LoadShelves((engineSourceAssetPath / "Editor" / "Scripts").c_str(),
-            (engineSourceAssetPath / "Editor" / "Scripts" / "Shelves").c_str(), actionManager);
-    }
-}
-
-void CToolBoxManager::LoadShelves(QString scriptPath, QString shelvesPath, ActionManager* actionManager)
-{
-    IFileUtil::FileArray files;
-    CFileUtil::ScanDirectory(shelvesPath, "*.xml", files);
-
-    const int shelfCount = files.size();
-    for (int idx = 0; idx < shelfCount; ++idx)
-    {
-        if (Path::GetExt(files[idx].filename) != "xml")
-        {
-            continue;
-        }
-
-        QString shelfName(PathUtil::GetFileName(files[idx].filename.toUtf8().data()));
-
-        AmazonToolbar toolbar(shelfName, shelfName);
-        Load(shelvesPath + QString("/") + files[idx].filename, &toolbar, false, actionManager);
-
-        m_toolbars.push_back(toolbar);
-    }
 }
 
 void CToolBoxManager::Load(QString xmlpath, AmazonToolbar* pToolbar, bool bToolbox, ActionManager* actionManager)

Code/Editor/ToolBox.h

@@ -129,7 +129,6 @@ public:
     void Save() const;
     // Load macros configuration from registry.
     void Load(ActionManager* actionManager = nullptr);
-    void LoadShelves(QString scriptPath, QString shelvesPath, ActionManager* actionManager);
 
     //! Get the number of managed macros.
     int GetMacroCount(bool bToolbox) const;