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

Integrating github/staging through commit 5f214be

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.cpp
+2 -4
View File
@@ -1075,8 +1075,6 @@ void CUiAnimViewDialog::OnDelSequence()
AZ_Error("UiAnimViewDialog", false, "Could not find sequence");
return;
}
UpdateActions();
}
}
@@ -1568,7 +1566,7 @@ void CUiAnimViewDialog::ReadMiscSettings()
//////////////////////////////////////////////////////////////////////////
void CUiAnimViewDialog::SaveLayouts()
{
QSettings settings("Amazon", "Lumberyard");
QSettings settings("Amazon", "O3DE");
settings.beginGroup("UiAnimView");
QByteArray stateData = this->saveState();
settings.setValue("layout", stateData);
@@ -1583,7 +1581,7 @@ void CUiAnimViewDialog::SaveLayouts()
//////////////////////////////////////////////////////////////////////////
void CUiAnimViewDialog::ReadLayouts()
{
QSettings settings("Amazon", "Lumberyard");
QSettings settings("Amazon", "O3DE");
settings.beginGroup("UiAnimView");
if (settings.contains("layout"))
{