Integrating github/staging through commit 5f214be

This commit is contained in:
alexpete
2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
@@ -151,7 +151,7 @@ GraphicsSettingsDialog::GraphicsSettingsDialog(QWidget* parent /* = nullptr */)
m_ui->m_platformEntry->addItem(platform);
}
QSettings settings("Amazon", "Lumberyard");
QSettings settings("Amazon", "O3DE");
settings.beginGroup("GraphicsSettingsDialog");
if (settings.contains("Platform"))
@@ -179,7 +179,7 @@ GraphicsSettingsDialog::GraphicsSettingsDialog(QWidget* parent /* = nullptr */)
GraphicsSettingsDialog::~GraphicsSettingsDialog()
{
QSettings settings("Amazon", "Lumberyard");
QSettings settings("Amazon", "O3DE");
settings.beginGroup("GraphicsSettingsDialog");
auto platformCheck = [this](AZStd::pair<AZStd::string, ESystemConfigPlatform>& stringConfigPair) { return stringConfigPair.second == m_currentPlatform; };
@@ -561,7 +561,7 @@ void GraphicsSettingsDialog::LoadPlatformConfigurations()
setUpdatesEnabled(true);
QSettings settings("Amazon", "Lumberyard");
QSettings settings("Amazon", "O3DE");
settings.beginGroup("GraphicsSettingsDialog");
settings.beginGroup("cvarGroup");
@@ -624,7 +624,7 @@ void GraphicsSettingsDialog::CleanUI()
{
setUpdatesEnabled(false);
QSettings settings("Amazon", "Lumberyard");
QSettings settings("Amazon", "O3DE");
settings.beginGroup("GraphicsSettingsDialog");
settings.beginGroup("cvarGroup");