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
Code/Sandbox/Editor/IEditorImpl.cpp
+4 -4
View File
@@ -1432,10 +1432,10 @@ AZStd::string CEditorImpl::LoadProjectIdFromProjectData()
QByteArray editorProjectNameUtf8 = editorProjectName.toUtf8();
AZ::Uuid id = AZ::Uuid::CreateName(editorProjectNameUtf8.constData());
// The projects that Lumberyard ships with had their project IDs hand-generated based on the name of the level.
// The projects that Open 3D Engine ships with had their project IDs hand-generated based on the name of the level.
// Therefore, if the UUID from the project name is the same as the UUID in the file, it's one of our projects
// and we can therefore send the name back, making it easier for Metrics to determine which level it was.
// We are checking to see if this is a project we ship with Lumberyard, and therefore we can unobfuscate non-customer information.
// We are checking to see if this is a project we ship with Open 3D Engine, and therefore we can unobfuscate non-customer information.
if (id != AZ::Uuid(projectId.data()))
{
return projectId;
@@ -2097,7 +2097,7 @@ namespace
void CEditorImpl::LoadSettings()
{
QSettings settings(QStringLiteral("Amazon"), QStringLiteral("Lumberyard"));
QSettings settings(QStringLiteral("Amazon"), QStringLiteral("O3DE"));
settings.beginGroup(QStringLiteral("Editor"));
settings.beginGroup(QStringLiteral("CoordSys"));
@@ -2116,7 +2116,7 @@ void CEditorImpl::LoadSettings()
void CEditorImpl::SaveSettings() const
{
QSettings settings(QStringLiteral("Amazon"), QStringLiteral("Lumberyard"));
QSettings settings(QStringLiteral("Amazon"), QStringLiteral("O3DE"));
settings.beginGroup(QStringLiteral("Editor"));
settings.beginGroup(QStringLiteral("CoordSys"));