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/Settings.cpp
+4 -5
View File
@@ -703,6 +703,10 @@ void SEditorSettings::Save()
//////////////////////////////////////////////////////////////////////////
void SEditorSettings::Load()
{
// Load from Settings Registry
AzFramework::ApplicationRequests::Bus::BroadcastResult(
prefabSystem, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
const int settingsVersion = s_editorSettings()->value(QStringLiteral("Settings/EditorSettingsVersion"), 0).toInt();
if (settingsVersion != EditorSettingsVersion)
@@ -942,11 +946,6 @@ void SEditorSettings::Load()
searchPaths[id].push_back(path);
}
}
// Load from Settings Registry
AzFramework::ApplicationRequests::Bus::BroadcastResult(
prefabSystem, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
}
//////////////////////////////////////////////////////////////////////////