birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/MainWindow.cpp
+8 -4
View File
@@ -637,8 +637,6 @@ MainWindow* MainWindow::instance()
void MainWindow::closeEvent(QCloseEvent* event)
{
auto cryEdit = CCryEditApp::instance();
gSettings.Save();
AzFramework::SystemCursorState currentCursorState;
@@ -1819,7 +1817,6 @@ void MainWindow::OnUpdateSnapToGrid(QAction* action)
bool bEnabled = gSettings.pGrid->IsEnabled();
action->setChecked(bEnabled);
float gridSize = gSettings.pGrid->size;
action->setText(QObject::tr("Snap To Grid"));
}
@@ -1846,7 +1843,14 @@ void MainWindow::OpenViewPane(QtViewPane* pane)
}
else
{
qWarning() << Q_FUNC_INFO << "Invalid pane" << pane->m_id << pane->m_category << pane->m_name;
if (pane)
{
qWarning() << Q_FUNC_INFO << "Invalid pane" << pane->m_id << pane->m_category << pane->m_name;
}
else
{
qWarning() << Q_FUNC_INFO << "Invalid pane";
}
}
}