Merge commit 'b2a8e4056950398e13f2fe32f486d29733669a2b' into mbalfour/gitflow_211102_o3de

2021-11-02 09:37:12 -05:00
parent bf0a309a3c b2a8e40569
commit 5867ab6bde
14 changed files with 50 additions and 128 deletions
@@ -832,7 +832,7 @@ QAction* LevelEditorMenuHandler::CreateViewPaneAction(const QtViewPane* view)

        if (view->m_options.showOnToolsToolbar)
        {
-            action->setIcon(QIcon(view->m_options.toolbarIcon));
+            action->setIcon(QIcon(view->m_options.toolbarIcon.c_str()));
        }

        m_actionManager->AddAction(view->m_id, action);