Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport

Code/Sandbox/Editor/AboutDialog.cpp

@@ -55,7 +55,7 @@ CAboutDialog::CAboutDialog(QString versionText, QString richTextCopyrightNotice,
     QImage backgroundImage(QStringLiteral(":/StartupLogoDialog/splashscreen_1_27.png"));
     m_backgroundImage = QPixmap::fromImage(backgroundImage.scaled(m_enforcedWidth, m_enforcedHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
 
-    // Draw the Lumberyard logo from svg
+    // Draw the Open 3D Engine logo from svg
     m_ui->m_logo->load(QStringLiteral(":/StartupLogoDialog/lumberyard_logo.svg"));
 
     // Prevent re-sizing

Code/Sandbox/Editor/AboutDialog.ui

@@ -29,7 +29,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>About Lumberyard Editor</string>
+   <string>About Open 3D Engine Editor</string>
   </property>
   <property name="styleSheet">
    <string notr="true">background-color: transparent</string>
@@ -92,7 +92,7 @@
        <item>
         <widget class="QLabel" name="m_transparentVersion">
          <property name="text">
-          <string>Lumberyard Editor</string>
+          <string>Open 3D Engine Editor</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>

Code/Sandbox/Editor/Alembic/AlembicCompiler.cpp

@@ -153,6 +153,6 @@ void CAlembicCompiler::AddSourceFileOpeners(const char* fullSourceFileName, [[ma
             }
         };
 
-        openers.push_back({ "Lumberyard_AlembicCompiler", "Open In Alembic Compiler...", QIcon(), alembicCallback });
+        openers.push_back({ "O3DE_AlembicCompiler", "Open In Alembic Compiler...", QIcon(), alembicCallback });
     }
 }

Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp

@@ -283,7 +283,7 @@ void AzAssetBrowserRequestHandler::AddContextMenuActions(QWidget* caller, QMenu*
 
         // Add the "Open" menu item.
         // Note that source file openers are allowed to "veto" the showing of the "Open" menu if it is 100% known that they aren't openable!
-        // for example, custom data formats that are made by Lumberyard that can not have a program associated in the operating system to view them.
+        // for example, custom data formats that are made by Open 3D Engine that can not have a program associated in the operating system to view them.
         // If the only opener that can open that file has no m_opener, then it is not openable.
         SourceFileOpenerList openers;
         AssetBrowserInteractionNotificationBus::Broadcast(&AssetBrowserInteractionNotificationBus::Events::AddSourceFileOpeners, fullFilePath.c_str(), sourceID, openers);
@@ -553,11 +553,11 @@ void AzAssetBrowserRequestHandler::AddSourceFileOpeners(const char* fullSourceFi
     if (AZStd::wildcard_match("*.lua", fullSourceFileName))
     {
         AZStd::string fullName(fullSourceFileName);
-        // LUA files can be opened with the lumberyard LUA editor.
+        // LUA files can be opened with the O3DE LUA editor.
         openers.push_back(
             {
-                "Lumberyard_LUA_Editor",
-                "Open in Lumberyard LUA Editor...",
+                "O3DE_LUA_Editor",
+                "Open in Open 3D Engine LUA Editor...",
                 QIcon(),
                 [](const char* fullSourceFileNameInCallback, const AZ::Uuid& /*sourceUUID*/)
                 {

Code/Sandbox/Editor/CMakeLists.txt

@@ -135,7 +135,7 @@ ly_add_source_properties(
     SOURCES CryEdit.cpp
     PROPERTY COMPILE_DEFINITIONS 
     VALUES 
-        LUMBERYARD_COPYRIGHT_YEAR=${LY_VERSION_COPYRIGHT_YEAR}
+        O3DE_COPYRIGHT_YEAR=${LY_VERSION_COPYRIGHT_YEAR}
         LY_BUILD=${LY_VERSION_BUILD_NUMBER}
         ${LY_PAL_TOOLS_DEFINES}
 )

Code/Sandbox/Editor/Controls/ColorGradientCtrl.cpp

@@ -137,10 +137,6 @@ void CColorGradientCtrl::PointToTimeValue(QPoint point, float& time, ISplineInte
 float CColorGradientCtrl::XOfsToTime(int x)
 {
     return m_grid.ClientToWorld(QPoint(x, 0)).x;
-
-    // m_fMinTime to m_fMaxTime time range.
-    float time = m_fMinTime + (float)((m_fMaxTime - m_fMinTime) * (x - m_rcGradient.left())) / m_rcGradient.width();
-    return time;
 }
 
 //////////////////////////////////////////////////////////////////////////

Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp

@@ -672,7 +672,6 @@ CReflectedVar * ReflectedPropertyControl::GetReflectedVarFromCallbackInstance(Az
         return reinterpret_cast<CReflectedVar *>(pNode->GetInstance(0));
     else
         return GetReflectedVarFromCallbackInstance(pNode->GetParent());
-    return nullptr;
 }
 
 

Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp

@@ -918,15 +918,15 @@ QMenu* LevelEditorMenuHandler::CreateHelpMenu()
 
                 QUrl docSearchUrl("https://docs.aws.amazon.com/search/doc-search.html");
                 QUrlQuery docSearchQuery;
-                QString lumberyardProductString = QUrl::toPercentEncoding("Amazon Lumberyard");
+                QString o3deProductString = QUrl::toPercentEncoding("Open 3D Engine");
                 // The order of these QueryItems matters. wiki Search URL Formatting
                 docSearchQuery.addQueryItem("searchPath", "documentation-product");
                 docSearchQuery.addQueryItem("searchQuery", text);
-                docSearchQuery.addQueryItem("this_doc_product", lumberyardProductString);
+                docSearchQuery.addQueryItem("this_doc_product", o3deProductString);
                 docSearchQuery.addQueryItem("ref", "lye");
                 docSearchQuery.addQueryItem("ev", productVersionString);
                 docSearchUrl.setQuery(docSearchQuery);
-                docSearchUrl.setFragment(QString("facet_doc_product=%1").arg(lumberyardProductString));
+                docSearchUrl.setFragment(QString("facet_doc_product=%1").arg(o3deProductString));
                 QDesktopServices::openUrl(docSearchUrl);
             }
             lineEdit->clear();
@@ -948,8 +948,8 @@ QMenu* LevelEditorMenuHandler::CreateHelpMenu()
     // Glossary
     documentationMenu.AddAction(ID_DOCUMENTATION_GLOSSARY);
 
-    // Lumberyard Documentation
-    documentationMenu.AddAction(ID_DOCUMENTATION_LUMBERYARD);
+    // Open 3D Engine Documentation
+    documentationMenu.AddAction(ID_DOCUMENTATION_O3DE);
 
     // GameLift Documentation
     documentationMenu.AddAction(ID_DOCUMENTATION_GAMELIFT);
@@ -980,7 +980,7 @@ QMenu* LevelEditorMenuHandler::CreateHelpMenu()
     // Report a Bug???
     // auto reportBugMenu = helpMenu.Get()->addAction(tr("Report a Bug"));
 
-    // About Lumberyard
+    // About Open 3D Engine
     helpMenu.AddAction(ID_APP_ABOUT);
 
     // Welcome dialog

Code/Sandbox/Editor/Core/QtEditorApplication.cpp

@@ -35,7 +35,7 @@
 
 // AzQtComponents
 #include <AzQtComponents/Components/GlobalEventFilter.h>
-#include <AzQtComponents/Components/LumberyardStylesheet.h>
+#include <AzQtComponents/Components/O3DEStylesheet.h>
 #include <AzQtComponents/Components/Titlebar.h>
 #include <AzQtComponents/Components/WindowDecorationWrapper.h>
 
@@ -53,7 +53,7 @@ enum
     UninitializedFrequency = 9999,
 };
 
-Q_LOGGING_CATEGORY(InputDebugging, "lumberyard.editor.input")
+Q_LOGGING_CATEGORY(InputDebugging, "o3de.editor.input")
 
 // internal, private namespace:
 namespace
@@ -249,17 +249,17 @@ namespace Editor
     EditorQtApplication::EditorQtApplication(int& argc, char** argv)
         : QApplication(argc, argv)
         , m_inWinEventFilter(false)
-        , m_stylesheet(new AzQtComponents::LumberyardStylesheet(this))
+        , m_stylesheet(new AzQtComponents::O3DEStylesheet(this))
         , m_idleTimer(new QTimer(this))
     {
         m_idleTimer->setInterval(UninitializedFrequency);
 
-        setWindowIcon(QIcon(":/Application/res/lyeditor.ico"));
+        setWindowIcon(QIcon(":/Application/res/o3de_editor.ico"));
 
         // set the default key store for our preferences:
         setOrganizationName("Amazon");
         setOrganizationDomain("amazon.com");
-        setApplicationName("Lumberyard");
+        setApplicationName("Open 3D Engine");
 
         connect(m_idleTimer, &QTimer::timeout, this, &EditorQtApplication::maybeProcessIdle);
 
@@ -267,7 +267,7 @@ namespace Editor
         installEventFilter(this);
 
         // Disable our debugging input helpers by default
-        QLoggingCategory::setFilterRules(QStringLiteral("lumberyard.editor.input.*=false"));
+        QLoggingCategory::setFilterRules(QStringLiteral("o3de.editor.input.*=false"));
 
         // Initialize our stylesheet here to allow Gems to register stylesheets when their system components activate.
         AZ::IO::FixedMaxPath engineRootPath;

Code/Sandbox/Editor/Core/QtEditorApplication.h

@@ -32,7 +32,7 @@ class QByteArray;
 
 namespace AzQtComponents
 {
-    class LumberyardStylesheet;
+    class O3DEStylesheet;
 }
 
 enum EEditorNotifyEvent;
@@ -118,7 +118,7 @@ namespace Editor
         void UninstallFilters();
         void maybeProcessIdle();
 
-        AzQtComponents::LumberyardStylesheet* m_stylesheet;
+        AzQtComponents::O3DEStylesheet* m_stylesheet;
 
         bool m_inWinEventFilter = false;
 

Code/Sandbox/Editor/CryEdit.cpp

@@ -187,8 +187,8 @@ AZ_POP_DISABLE_WARNING
 
 #include <AzCore/std/smart_ptr/make_shared.h>
 
-static const char lumberyardEditorClassName[] = "LumberyardEditorClass";
-static const char lumberyardApplicationName[] = "LumberyardApplication";
+static const char O3DEEditorClassName[] = "O3DEEditorClass";
+static const char O3DEApplicationName[] = "O3DEApplication";
 
 static AZ::EnvironmentVariable<bool> inEditorBatchMode = nullptr;
 
@@ -378,7 +378,7 @@ void CCryEditApp::RegisterActionHandlers()
     ON_COMMAND(ID_DOCUMENTATION_GETTINGSTARTEDGUIDE, OnDocumentationGettingStartedGuide)
     ON_COMMAND(ID_DOCUMENTATION_TUTORIALS, OnDocumentationTutorials)
     ON_COMMAND(ID_DOCUMENTATION_GLOSSARY, OnDocumentationGlossary)
-    ON_COMMAND(ID_DOCUMENTATION_LUMBERYARD, OnDocumentationLumberyard)
+    ON_COMMAND(ID_DOCUMENTATION_O3DE, OnDocumentationO3DE)
     ON_COMMAND(ID_DOCUMENTATION_GAMELIFT, OnDocumentationGamelift)
     ON_COMMAND(ID_DOCUMENTATION_RELEASENOTES, OnDocumentationReleaseNotes)
     ON_COMMAND(ID_DOCUMENTATION_GAMEDEVBLOG, OnDocumentationGameDevBlog)
@@ -639,7 +639,7 @@ public:
         QString appRootOverride;
         parser.addHelpOption();
         parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
-        parser.setApplicationDescription(QObject::tr("Amazon Lumberyard"));
+        parser.setApplicationDescription(QObject::tr("Open 3D Engine"));
         // nsDocumentRevisionDebugMode is an argument that the macOS system passed into an App bundle that is being debugged.
         // Need to include it here so that Qt argument parser does not error out.
         bool nsDocumentRevisionsDebugMode = false;
@@ -758,13 +758,13 @@ struct SharedData
 //      article Q141752 to locate the previous instance of the application. .
 BOOL CCryEditApp::FirstInstance(bool bForceNewInstance)
 {
-    QSystemSemaphore sem(QString(lumberyardApplicationName) + "_sem", 1);
+    QSystemSemaphore sem(QString(O3DEApplicationName) + "_sem", 1);
     sem.acquire();
     {
-        FixDanglingSharedMemory(lumberyardEditorClassName);
+        FixDanglingSharedMemory(O3DEEditorClassName);
     }
     sem.release();
-    m_mutexApplication = new QSharedMemory(lumberyardEditorClassName);
+    m_mutexApplication = new QSharedMemory(O3DEEditorClassName);
     if (!m_mutexApplication->create(sizeof(SharedData)) && !bForceNewInstance)
     {
         m_mutexApplication->attach();
@@ -789,7 +789,7 @@ BOOL CCryEditApp::FirstInstance(bool bForceNewInstance)
         sem.release();
         QTimer* t = new QTimer(this);
         connect(t, &QTimer::timeout, this, [this]() {
-            QSystemSemaphore sem(QString(lumberyardApplicationName) + "_sem", 1);
+            QSystemSemaphore sem(QString(O3DEApplicationName) + "_sem", 1);
             sem.acquire();
             SharedData* data = reinterpret_cast<SharedData*>(m_mutexApplication->data());
             QString preview = QString::fromLatin1(data->text);
@@ -1018,9 +1018,9 @@ QString FormatRichTextCopyrightNotice()
 {
     // copyright symbol is HTML Entity = &#xA9;
     QString copyrightHtmlSymbol = "&#xA9;";
-    QString copyrightString = QObject::tr("Lumberyard and related materials Copyright %1 %2 Amazon Web Services, Inc., its affiliates or licensors.<br>By accessing or using these materials, you agree to the terms of the AWS Customer Agreement.");
+    QString copyrightString = QObject::tr("Open 3D Engine and related materials Copyright %1 %2 Amazon Web Services, Inc., its affiliates or licensors.<br>By accessing or using these materials, you agree to the terms of the AWS Customer Agreement.");
 
-    return copyrightString.arg(copyrightHtmlSymbol).arg(LUMBERYARD_COPYRIGHT_YEAR);
+    return copyrightString.arg(copyrightHtmlSymbol).arg(O3DE_COPYRIGHT_YEAR);
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1180,8 +1180,8 @@ BOOL CCryEditApp::CheckIfAlreadyRunning()
 
     if (!m_bPreviewMode)
     {
-        FixDanglingSharedMemory(lumberyardApplicationName);
-        m_mutexApplication = new QSharedMemory(lumberyardApplicationName);
+        FixDanglingSharedMemory(O3DEApplicationName);
+        m_mutexApplication = new QSharedMemory(O3DEApplicationName);
         if (!m_mutexApplication->create(16))
         {
             // Don't prompt the user in non-interactive export mode.  Instead, default to allowing multiple instances to 
@@ -1189,7 +1189,7 @@ BOOL CCryEditApp::CheckIfAlreadyRunning()
             // NOTE:  If you choose to do this, be sure to export *different* levels, since nothing prevents multiple runs 
             // from trying to write to the same level at the same time.
             // If we're running interactively, let's ask and make sure the user actually intended to do this.
-            if (!m_bExportMode && QMessageBox::question(AzToolsFramework::GetActiveWindow(), QObject::tr("Too many apps"), QObject::tr("There is already a Lumberyard application running\nDo you want to start another one?")) != QMessageBox::Yes)
+            if (!m_bExportMode && QMessageBox::question(AzToolsFramework::GetActiveWindow(), QObject::tr("Too many apps"), QObject::tr("There is already an Open 3D Engine application running\nDo you want to start another one?")) != QMessageBox::Yes)
             {
                 return false;
             }
@@ -1798,7 +1798,7 @@ BOOL CCryEditApp::InitInstance()
     GetIEditor()->GetCommandManager()->RegisterAutoCommands();
     GetIEditor()->AddUIEnums();
 
-    mainWindowWrapper->enableSaveRestoreGeometry("amazon", "lumberyard", "mainWindowGeometry");
+    mainWindowWrapper->enableSaveRestoreGeometry("amazon", "O3DE", "mainWindowGeometry");
     m_pDocManager->OnFileNew();
 
     if (IsInRegularEditorMode())
@@ -2090,7 +2090,7 @@ void CCryEditApp::OnAppAbout()
     aboutDlg.exec();
 }
 
-// App command to run the Welcome to Lumberyard dialog
+// App command to run the Welcome to Open 3D Engine dialog
 void CCryEditApp::OnAppShowWelcomeScreen()
 {
     // This logic is a simplified version of the startup
@@ -2182,7 +2182,7 @@ void CCryEditApp::OnDocumentationGlossary()
     QDesktopServices::openUrl(QUrl(webLink));
 }
 
-void CCryEditApp::OnDocumentationLumberyard()
+void CCryEditApp::OnDocumentationO3DE()
 {
     QString webLink = tr("https://docs.aws.amazon.com/lumberyard/userguide");
     QDesktopServices::openUrl(QUrl(webLink));
@@ -5399,7 +5399,7 @@ void CCryEditApp::SetEditorWindowTitle(QString sTitleStr, QString sPreTitleStr,
 
         if (sTitleStr.isEmpty())
         {
-            sTitleStr = QObject::tr("Lumberyard Editor Beta %1 - Build %2").arg(platform).arg(LY_BUILD);
+            sTitleStr = QObject::tr("Open 3D Engine Editor Beta %1 - Build %2").arg(platform).arg(LY_BUILD);
         }
 
         if (!sPreTitleStr.isEmpty())

Code/Sandbox/Editor/CryEdit.h

@@ -196,7 +196,7 @@ public:
     void OnUpdateShowWelcomeScreen(QAction* action);
     void OnDocumentationTutorials();
     void OnDocumentationGlossary();
-    void OnDocumentationLumberyard();
+    void OnDocumentationO3DE();
     void OnDocumentationGamelift();
     void OnDocumentationReleaseNotes();
     void OnDocumentationGameDevBlog();

Code/Sandbox/Editor/DatabaseFrameWnd.cpp

@@ -1336,7 +1336,7 @@ bool LibraryItemTreeModel::DoesGroupExist([[maybe_unused]] const QString& groupN
 QStringList LibraryItemTreeModel::mimeTypes() const
 {
     QStringList mimeTypes;
-    mimeTypes << QStringLiteral("application/x-lumberyard-libraryitems");
+    mimeTypes << QStringLiteral("application/x-o3de-libraryitems");
     return mimeTypes;
 }
 
@@ -1412,9 +1412,9 @@ bool LibraryItemTreeModel::MoveItem(CBaseLibraryItem* item, const QModelIndex& t
 
 bool LibraryItemTreeModel::dropMimeData(const QMimeData* data, [[maybe_unused]] Qt::DropAction action, [[maybe_unused]] int row, [[maybe_unused]] int column, const QModelIndex& index)
 {
-    if (data->hasFormat("application/x-lumberyard-libraryitems"))
+    if (data->hasFormat("application/x-o3de-libraryitems"))
     {
-        QByteArray array = data->data("application/x-lumberyard-libraryitems");
+        QByteArray array = data->data("application/x-o3de-libraryitems");
 
         QModelIndex targetParent = index;
 
@@ -1474,7 +1474,7 @@ QMimeData* LibraryItemTreeModel::mimeData(const QModelIndexList& indexes) const
     }
 
     QMimeData* data = new QMimeData;
-    data->setData(QStringLiteral("application/x-lumberyard-libraryitems"), array);
+    data->setData(QStringLiteral("application/x-o3de-libraryitems"), array);
     return data;
 }
 

Code/Sandbox/Editor/EditorCryEdit.rc

@@ -1 +1 @@
-IDI_ICON1                          ICON    DISCARDABLE               "res\\lyeditor.ico"
+IDI_ICON1                          ICON    DISCARDABLE               "res\\o3de_editor.ico"

Code/Sandbox/Editor/EditorPanelUtils.cpp

@@ -242,7 +242,7 @@ public:
 
     virtual bool HotKey_LoadExisting() override
     {
-        QSettings settings("Amazon", "Lumberyard");
+        QSettings settings("Amazon", "O3DE");
         QString group = "Hotkeys/";
 
         HotKey_BuildDefaults();
@@ -278,7 +278,7 @@ public:
 
     virtual void HotKey_SaveCurrent() override
     {
-        QSettings settings("Amazon", "Lumberyard");
+        QSettings settings("Amazon", "O3DE");
         QString group = "Hotkeys/";
         settings.remove("Hotkeys/");
         settings.sync();

Code/Sandbox/Editor/EditorPreferencesPageGeneral.cpp

@@ -101,10 +101,10 @@ void CEditorPreferencesPage_General::Reflect(AZ::SerializeContext& serialize)
             ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_stylusMode, "Stylus Mode", "Stylus Mode for tablets and other pointing devices")
             ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_restoreViewportCamera, EditorPreferencesGeneralRestoreViewportCameraSettingName, "Keep the original editor viewport transform when exiting game mode.")
             ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_enableSceneInspector, "Enable Scene Inspector (EXPERIMENTAL)", "Enable the option to inspect the internal data loaded from scene files like .fbx. This is an experimental feature. Restart the Scene Settings if the option is not visible under the Help menu.")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_enablePrefabSystem, "Enable Prefab System (EXPERIMENTAL)", "Enable this option to preview Lumberyard's new prefab system. Enabling this setting removes slice support for level entities; you will need to restart the Editor for the change to take effect.");
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_enablePrefabSystem, "Enable Prefab System (EXPERIMENTAL)", "Enable this option to preview Open 3D Engine's new prefab system. Enabling this setting removes slice support for level entities; you will need to restart the Editor for the change to take effect.");
 
         editContext->Class<Messaging>("Messaging", "")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Messaging::m_showDashboard, "Show Welcome to Lumberyard at startup", "Show Welcome to Lumberyard at startup")
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Messaging::m_showDashboard, "Show Welcome to Open 3D Engine at startup", "Show Welcome to Open 3D Engine at startup")
             ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Messaging::m_showCircularDependencyError, "Show Error: Circular dependency", "Show an error message when adding a slice instance to the target slice would create a cyclic asset dependency. All other valid overrides will be saved even if this is turned off.");
 
         editContext->Class<Undo>("Undo", "")

Code/Sandbox/Editor/FeedbackDialog/FeedbackDialog.cpp

@@ -21,10 +21,10 @@ AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
 
 namespace {
     QString feedbackText = "<h3>We love getting feedback from our customers.</h3>"
-        "Feedback from our community helps us to constantly improve Lumberyard.<br/><br/>"
+        "Feedback from our community helps us to constantly improve Open 3D Engine.<br/><br/>"
         "In addition to using our forums and AWS support channels, you can always email us with your comments and suggestions at "
-        "<a href=\"mailto:lumberyard-feedback@amazon.com\" style=\"color: #4285F4;\">lumberyard-feedback@amazon.com</a>.  "
-        "While we do not respond to everyone who submits feedback, we read everything and aspire to use your feedback to improve Lumberyard for everyone.";
+        "<a href=\"mailto:o3de-feedback@amazon.com\" style=\"color: #4285F4;\">o3de-feedback@amazon.com</a>.  "
+        "While we do not respond to everyone who submits feedback, we read everything and aspire to use your feedback to improve Open 3D Engine for everyone.";
 }
 
 

Code/Sandbox/Editor/GraphicsSettingsDialog.cpp

@@ -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");
 

Code/Sandbox/Editor/IEditorImpl.cpp

@@ -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"));

Code/Sandbox/Editor/KeyboardCustomizationSettings.cpp

@@ -109,7 +109,7 @@ void KeyboardCustomizationSettings::LoadDefaults()
 
 void KeyboardCustomizationSettings::Load()
 {
-    QSettings settings(QStringLiteral("Amazon"), QStringLiteral("Lumberyard"));
+    QSettings settings(QStringLiteral("Amazon"), QStringLiteral("O3DE"));
     settings.beginGroup(QStringLiteral("Keyboard Shortcuts"));
     settings.beginGroup(m_group);
 
@@ -156,7 +156,7 @@ void KeyboardCustomizationSettings::LoadFromSnapshot(const Snapshot& snapshot)
 
 void KeyboardCustomizationSettings::Save()
 {
-    QSettings settings(QStringLiteral("Amazon"), QStringLiteral("Lumberyard"));
+    QSettings settings(QStringLiteral("Amazon"), QStringLiteral("O3DE"));
     settings.beginGroup(QStringLiteral("Keyboard Shortcuts"));
     settings.beginGroup(m_group);
 
@@ -189,7 +189,7 @@ KeyboardCustomizationSettings::Snapshot KeyboardCustomizationSettings::CreateSna
 
 void KeyboardCustomizationSettings::ExportToFile(QWidget* parent)
 {
-    QString fileName = QFileDialog::getSaveFileName(parent, QObject::tr("Export Keyboard Shortcuts"), QStringLiteral("lumberyard.keys"), QObject::tr("Keyboard Settings (*.keys)"));
+    QString fileName = QFileDialog::getSaveFileName(parent, QObject::tr("Export Keyboard Shortcuts"), QStringLiteral("o3de.keys"), QObject::tr("Keyboard Settings (*.keys)"));
     if (fileName.isEmpty())
     {
         return;
@@ -205,7 +205,7 @@ void KeyboardCustomizationSettings::ExportToFile(QWidget* parent)
 
     QJsonObject store;
     store.insert("version", "1.0");
-    store.insert("Content-Type", "application/x-lumberyard-sdk-keyboard-settings+json");
+    store.insert("Content-Type", "application/x-o3de-sdk-keyboard-settings+json");
     QJsonObject groups;
 
     for (auto instance = m_instances.constBegin(); instance != m_instances.constEnd(); instance++)
@@ -262,7 +262,7 @@ void KeyboardCustomizationSettings::ImportFromFile(QWidget* parent)
     QJsonDocument imported(QJsonDocument::fromJson(rawData));
     QJsonObject store = imported.object();
 
-    if (store.value("Content-Type") != "application/x-lumberyard-sdk-keyboard-settings+json" || store.value("version") != "1.0")
+    if (store.value("Content-Type") != "application/x-o3de-sdk-keyboard-settings+json" || store.value("version") != "1.0")
     {
         QMessageBox::critical(parent, QObject::tr("Shortcut Import Error"), QObject::tr("\"%1\" doesn't appear to contain keyboard settings").arg(fileName));
         return;

Code/Sandbox/Editor/LensFlareEditor/LensFlareAtomicList.cpp

@@ -292,7 +292,7 @@ QLensFlareAtomicListModel::Item* QLensFlareAtomicListModel::ItemFromIndex(QModel
 QStringList QLensFlareAtomicListModel::mimeTypes() const
 {
     return {
-               QStringLiteral("application/x-lumberyard-flaretypes")
+               QStringLiteral("application/x-o3de-flaretypes")
     };
 }
 
@@ -308,7 +308,7 @@ QMimeData* QLensFlareAtomicListModel::mimeData(const QModelIndexList& indexes) c
         stream << static_cast<int>(FlareTypeFromIndex(index));
     }
 
-    data->setData(QStringLiteral("application/x-lumberyard-flaretypes"), encoded);
+    data->setData(QStringLiteral("application/x-o3de-flaretypes"), encoded);
 
     return data;
 }

Code/Sandbox/Editor/LensFlareEditor/LensFlareEditor.cpp

@@ -1173,7 +1173,7 @@ LensFlareItemTreeModel::LensFlareItemTreeModel(CDatabaseFrameWnd* pParent)
 QStringList LensFlareItemTreeModel::mimeTypes() const
 {
     QStringList mimeTypes = LibraryItemTreeModel::mimeTypes();
-    mimeTypes << QStringLiteral("application/x-lumberyard-flaretypes");
+    mimeTypes << QStringLiteral("application/x-o3de-flaretypes");
     return mimeTypes;
 }
 
@@ -1184,9 +1184,9 @@ bool LensFlareItemTreeModel::dropMimeData(const QMimeData* data, Qt::DropAction
         return true;
     }
 
-    if (data->hasFormat(QStringLiteral("application/x-lumberyard-flaretypes")))
+    if (data->hasFormat(QStringLiteral("application/x-o3de-flaretypes")))
     {
-        QByteArray encoded = data->data(QStringLiteral("application/x-lumberyard-flaretypes"));
+        QByteArray encoded = data->data(QStringLiteral("application/x-o3de-flaretypes"));
         QDataStream stream(&encoded, QIODevice::ReadOnly);
 
         while (!stream.atEnd())

Code/Sandbox/Editor/LensFlareEditor/LensFlareElementTree.cpp

@@ -737,8 +737,8 @@ bool LensFlareElementTreeModel::removeRows(int row, int count, const QModelIndex
 QStringList LensFlareElementTreeModel::mimeTypes() const
 {
     QStringList types;
-    types << QStringLiteral("application/x-lumberyard-flareelements");
-    types << QStringLiteral("application/x-lumberyard-flaretypes");
+    types << QStringLiteral("application/x-o3de-flareelements");
+    types << QStringLiteral("application/x-o3de-flaretypes");
     return types;
 }
 
@@ -754,7 +754,7 @@ QMimeData* LensFlareElementTreeModel::mimeData(const QModelIndexList& indexes) c
         array.append(reinterpret_cast<const char*>(&pElement), sizeof(CLensFlareElement*));
     }
 
-    data->setData(QStringLiteral("application/x-lumberyard-flareelements"), array);
+    data->setData(QStringLiteral("application/x-o3de-flareelements"), array);
 
     return data;
 }
@@ -1052,11 +1052,11 @@ bool LensFlareElementTreeModel::MoveElement(CLensFlareElement* pElement, int row
 
 bool LensFlareElementTreeModel::dropMimeData(const QMimeData* data, [[maybe_unused]] Qt::DropAction action, int row, [[maybe_unused]] int column, const QModelIndex& parent)
 {
-    if (data->hasFormat(QStringLiteral("application/x-lumberyard-flaretypes")))
+    if (data->hasFormat(QStringLiteral("application/x-o3de-flaretypes")))
     {
         // drop from atomic list
 
-        QByteArray encoded = data->data(QStringLiteral("application/x-lumberyard-flaretypes"));
+        QByteArray encoded = data->data(QStringLiteral("application/x-o3de-flaretypes"));
         QDataStream stream(&encoded, QIODevice::ReadOnly);
 
         while (!stream.atEnd())
@@ -1070,9 +1070,9 @@ bool LensFlareElementTreeModel::dropMimeData(const QMimeData* data, [[maybe_unus
 
         return true;
     }
-    else if (data->hasFormat(QStringLiteral("application/x-lumberyard-flareelements")))
+    else if (data->hasFormat(QStringLiteral("application/x-o3de-flareelements")))
     {
-        QByteArray array = data->data("application/x-lumberyard-flareelements");
+        QByteArray array = data->data("application/x-o3de-flareelements");
 
         int count = array.size() / sizeof(CLensFlareElement*);
         auto ppElements = reinterpret_cast<CLensFlareElement**>(array.data());

Code/Sandbox/Editor/MainWindow.cpp

@@ -406,7 +406,7 @@ MainWindow::MainWindow(QWidget* parent)
     , m_undoStateAdapter(new UndoStackStateAdapter(this))
     , m_keyboardCustomization(nullptr)
     , m_activeView(nullptr)
-    , m_settings("amazon", "lumberyard") // TODO_KDAB: Replace with a central settings class
+    , m_settings("amazon", "O3DE") // TODO_KDAB: Replace with a central settings class
     , m_toolbarManager(new ToolbarManager(m_actionManager, this))
     , m_assetImporterManager(new AssetImporterManager(this))
     , m_levelEditorMenuHandler(new LevelEditorMenuHandler(this, m_viewPaneManager, m_settings))
@@ -1373,7 +1373,7 @@ void MainWindow::InitActions()
 
     am->AddAction(ID_DOCUMENTATION_GLOSSARY, tr("Glossary"))
         .SetReserved();
-    am->AddAction(ID_DOCUMENTATION_LUMBERYARD, tr("Lumberyard Documentation"))
+    am->AddAction(ID_DOCUMENTATION_O3DE, tr("Open 3D Engine Documentation"))
         .SetReserved();
     am->AddAction(ID_DOCUMENTATION_GAMELIFT, tr("GameLift Documentation"))
         .SetReserved();
@@ -1391,11 +1391,11 @@ void MainWindow::InitActions()
 
     am->AddAction(ID_DOCUMENTATION_FEEDBACK, tr("Give Us Feedback"))
         .SetReserved();
-    am->AddAction(ID_APP_ABOUT, tr("&About Lumberyard"))
+    am->AddAction(ID_APP_ABOUT, tr("&About Open 3D Engine"))
         .SetStatusTip(tr("Display program information, version number and copyright"))
         .SetReserved();
     am->AddAction(ID_APP_SHOW_WELCOME, tr("&Welcome"))
-        .SetStatusTip(tr("Show the Welcome to Lumberyard dialog box"))
+        .SetStatusTip(tr("Show the Welcome to Open 3D Engine dialog box"))
         .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateShowWelcomeScreen);
 
     // Editors Toolbar actions

Code/Sandbox/Editor/MainWindow.qrc

@@ -75,7 +75,7 @@
     <file>res/source_control-warning_v2.svg</file>
   </qresource>
   <qresource prefix="/Application">
-    <file>res/lyeditor.ico</file>
+    <file>res/o3de_editor.ico</file>
   </qresource>
   <qresource prefix="/Icons">
       <file alias="Eye.svg">res/Eye.svg</file>

Code/Sandbox/Editor/Material/MaterialManager.cpp

@@ -665,7 +665,7 @@ void CMaterialManager::AddSourceFileOpeners(const char* fullSourceFileName, [[ma
             }
         };
 
-        openers.push_back({ "Lumberyard_MaterialEditor", "Open In Material Editor...", QIcon(), materialCallback });
+        openers.push_back({ "O3DE_MaterialEditor", "Open In Material Editor...", QIcon(), materialCallback });
     }
 }
 

Code/Sandbox/Editor/Material/MaterialPythonFuncs.cpp

@@ -393,8 +393,6 @@ namespace
             return EFTT_SPECULAR_2;
         }
         throw std::runtime_error("Invalid texture name.");
-
-        return EFTT_MAX;
     }
 
     template<typename STRING>

Code/Sandbox/Editor/PluginManager.cpp

@@ -184,7 +184,7 @@ bool CPluginManager::LoadPlugins(const char* pPathWithMask)
             continue;
         }
 
-        // Lumberyard:
+        // Open 3D Engine:
         // Query the plugin settings, check for manual load...
         TPfnQueryPluginSettings pfnQuerySettings = reinterpret_cast<TPfnQueryPluginSettings>(hPlugin->resolve("QueryPluginSettings"));
 

Code/Sandbox/Editor/Resource.h

@@ -373,7 +373,7 @@
 #define ID_DOCUMENTATION_GETTINGSTARTEDGUIDE    36023
 #define ID_DOCUMENTATION_TUTORIALS              36024
 #define ID_DOCUMENTATION_GLOSSARY               36025
-#define ID_DOCUMENTATION_LUMBERYARD             36026
+#define ID_DOCUMENTATION_O3DE                   36026
 #define ID_DOCUMENTATION_GAMELIFT               36027
 #define ID_DOCUMENTATION_RELEASENOTES           36028
 #define ID_DOCUMENTATION_GAMEDEVBLOG            36029

Code/Sandbox/Editor/Settings.cpp

@@ -1090,7 +1090,7 @@ void SEditorSettings::ConvertPath(const AZStd::string_view sourcePath, AZStd::st
 {
     // This API accepts pipe-separated paths like "Category1|Category2|AttributeName"
     // But the SettingsManager requires 2 arguments, a Category like "Category1\Category2" and an attribute "AttributeName"
-    // The reason for the difference is to have this API be consistent with the path syntax in Lumberyard Python APIs.
+    // The reason for the difference is to have this API be consistent with the path syntax in Open 3D Engine Python APIs.
 
     // Find the last pipe separator ("|") in the path
     int lastSeparator = sourcePath.find_last_of("|");

Code/Sandbox/Editor/ShortcutDispatcher.h

@@ -45,10 +45,10 @@ class QKeyEvent;
   More documentation on Qt shortcuts
   -------------------------------------------
 
-  Here's some more detailed info regarding shortcuts in Qt. Not specific Lumberyard but
+  Here's some more detailed info regarding shortcuts in Qt. Not specific Open 3D Engine but
   useful as not explained in Qt docs much.
 
-  P.S.: The following text details the strategy used in an earlier Lumberyard version. Not sure which
+  P.S.: The following text details the strategy used in an earlier Open 3D Engine version. Not sure which
         shortcut context type it uses nowadays, but eitherway, the following text is educational,
         and all the traps still exist in current Qt (5.11).
 

Code/Sandbox/Editor/StartupLogoDialog.cpp

@@ -48,14 +48,14 @@ CStartupLogoDialog::CStartupLogoDialog(QString versionText, QString richTextCopy
     QImage backgroundImage(QStringLiteral(":/StartupLogoDialog/splashscreen_1_27.png"));
     m_backgroundImage = QPixmap::fromImage(backgroundImage.scaled(m_enforcedWidth, m_enforcedHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
 
-    // Draw the Lumberyard logo from svg
+    // Draw the Open 3D Engine logo from svg
     m_ui->m_logo->load(QStringLiteral(":/StartupLogoDialog/lumberyard_logo.svg"));
 
     m_ui->m_TransparentConfidential->setObjectName("copyrightNotice");
     m_ui->m_TransparentConfidential->setTextFormat(Qt::RichText);
     m_ui->m_TransparentConfidential->setText(richTextCopyrightNotice);
 
-    setWindowTitle(tr("Starting Lumberyard Editor"));
+    setWindowTitle(tr("Starting Open 3D Engine Editor"));
 
     setStyleSheet( "CStartupLogoDialog > QLabel { background: transparent; color: 'white' }\
                     CStartupLogoDialog > QLabel#copyrightNotice { color: #AAAAAA; font-size: 9px; } ");

Code/Sandbox/Editor/ThumbnailGenerator.cpp

@@ -193,45 +193,6 @@ void CThumbnailGenerator::GenerateForDirectory(const QString& path)
     //GetIEditor()->ShowConsole( false );
 }
 
-void CThumbnailGenerator::GenerateForFile(const QString& fileName)
+void CThumbnailGenerator::GenerateForFile([[maybe_unused]] const QString& fileName)
 {
-    return;
-
-    I3DEngine* engine = GetIEditor()->Get3DEngine();
-
-    int thumbSize = 128;
-    CImageEx image;
-    image.Allocate(thumbSize, thumbSize);
-
-    char drive[_MAX_DRIVE];
-    char fdir[_MAX_DIR];
-    char fname[_MAX_FNAME];
-    char fext[_MAX_EXT];
-    char bmpFile[1024];
-
-    _splitpath_s(fileName.toUtf8().data(), drive, fdir, fname, fext);
-
-    _makepath_s(bmpFile, drive, fdir, fname, ".tmb");
-    FileTimeType ft1, ft2;
-    GetThumbFileTime(fileName.toUtf8().data(), ft1);
-    GetThumbFileTime(bmpFile, ft2);
-    // Both cgf and bmp have same time stamp.
-    if (ThumbFileTimeIsEqual(ft1, ft2))
-    {
-        return;
-    }
-
-    _smart_ptr<IStatObj> obj = engine->LoadStatObjAutoRef(fileName.toUtf8().data(), NULL, NULL, false);
-    if (obj)
-    {
-        assert(!"IStatObj::MakeObjectPicture does not exist anymore");
-        //      obj->MakeObjectPicture( (unsigned char*)image.GetData(),thumbSize );
-
-        CImageUtil::SaveBitmap(bmpFile, image);
-        SetThumbFileTime(bmpFile, ft1);
-#if defined(AZ_PLATFORM_WINDOWS)
-        SetFileAttributes(bmpFile, FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_NOT_CONTENT_INDEXED);
-#endif
-        obj->Release();
-    }
 }

Code/Sandbox/Editor/ToolbarManager.cpp

@@ -217,7 +217,7 @@ public:
 ToolbarManager::ToolbarManager(ActionManager* actionManager, MainWindow* mainWindow)
     : m_mainWindow(mainWindow)
     , m_actionManager(actionManager)
-    , m_settings("amazon", "lumberyard")
+    , m_settings("amazon", "O3DE")
     , m_expanderWatcher(new AmazonToolBarExpanderWatcher())
 {
     // Note that we don't actually save/load from AmazonToolbar::List

Code/Sandbox/Editor/TrackView/TrackViewDialog.cpp

@@ -1870,7 +1870,7 @@ void CTrackViewDialog::ReadMiscSettings()
 //////////////////////////////////////////////////////////////////////////
 void CTrackViewDialog::SaveLayouts()
 {
-    QSettings settings("Amazon", "Lumberyard");
+    QSettings settings("Amazon", "O3DE");
     settings.beginGroup("TrackView");
     QByteArray stateData = this->saveState();
     settings.setValue("layout", stateData);
@@ -1886,7 +1886,7 @@ void CTrackViewDialog::SaveLayouts()
 //////////////////////////////////////////////////////////////////////////
 void CTrackViewDialog::ReadLayouts()
 {
-    QSettings settings("Amazon", "Lumberyard");
+    QSettings settings("Amazon", "O3DE");
     settings.beginGroup("TrackView");
 
     setViewMode(static_cast<ViewMode>(settings.value("lastViewMode").toInt()));

Code/Sandbox/Editor/TrackView/TrackViewPythonFuncs.cpp

@@ -481,8 +481,6 @@ namespace
         default:
             throw std::runtime_error("Unsupported key type");
         }
-
-        return AZStd::any();
     }
 
     AZStd::any PyTrackViewGetKeyValue(const char* paramName, int trackIndex, int keyIndex, const char* nodeName, const char* parentDirectorName)

Code/Sandbox/Editor/Util/ImageUtil.cpp

@@ -288,8 +288,6 @@ bool CImageUtil::LoadImage(const QString& fileName, CImageEx& image, bool* pQual
     {
         return CImageUtil::Load(fileName, image);
     }
-
-    return false;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -320,8 +318,6 @@ bool CImageUtil::SaveImage(const QString& fileName, CImageEx& image)
     {
         return Save(fileName, image);
     }
-
-    return false;
 }
 
 //////////////////////////////////////////////////////////////////////////

Code/Sandbox/Editor/ViewportTitleDlg.cpp

@@ -980,7 +980,7 @@ void CViewportTitleDlg::UpdateSearchOptionsText()
 
 void CViewportTitleDlg::LoadCustomPresets(const QString& section, const QString& keyName, QStringList& outCustompresets)
 {
-    QSettings settings("Amazon", "Lumberyard"); // Temporary solution until we have the global Settings class.
+    QSettings settings("Amazon", "O3DE"); // Temporary solution until we have the global Settings class.
     settings.beginGroup(section);
     outCustompresets = settings.value(keyName).toStringList();
     settings.endGroup();
@@ -988,7 +988,7 @@ void CViewportTitleDlg::LoadCustomPresets(const QString& section, const QString&
 
 void CViewportTitleDlg::SaveCustomPresets(const QString& section, const QString& keyName, const QStringList& custompresets)
 {
-    QSettings settings("Amazon", "Lumberyard"); // Temporary solution until we have the global Settings class.
+    QSettings settings("Amazon", "O3DE"); // Temporary solution until we have the global Settings class.
     settings.beginGroup(section);
     settings.setValue(keyName, custompresets);
     settings.endGroup();

Code/Sandbox/Editor/WelcomeScreen/WelcomeScreenDialog.ui

@@ -32,7 +32,7 @@
    <enum>Qt::TabFocus</enum>
   </property>
   <property name="windowTitle">
-   <string>Welcome to Lumberyard</string>
+   <string>Welcome to Open 3D Engine</string>
   </property>
   <property name="styleSheet">
    <string notr="true"/>

Code/Sandbox/Editor/res/lyeditor.ico

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2c9a6ddbfc423c717a03dacab45e134166a1b06030b4caf418d0a6a69c2d82d2
-size 114333

Code/Sandbox/Editor/res/o3de_editor.ico

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c042fce57915fc749abc7b37de765fd697c3c4d7de045a3d44805aa0ce29901a
+size 107016

Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp

@@ -438,45 +438,8 @@ void CComponentEntityObject::OnEntityIconChanged(const AZ::Data::AssetId& entity
     SetupEntityIcon();
 }
 
-void CComponentEntityObject::OnParentChanged([[maybe_unused]] AZ::EntityId oldParent, AZ::EntityId newParent)
+void CComponentEntityObject::OnParentChanged([[maybe_unused]] AZ::EntityId oldParent, [[maybe_unused]] AZ::EntityId newParent)
 {
-    return;
-
-    if (m_parentingReentryGuard) // Ignore if action originated from Sandbox.
-    {
-        EditorActionScope parentChange(m_parentingReentryGuard);
-
-        CComponentEntityObject* currentParent = static_cast<CComponentEntityObject*>(GetParent());
-
-        if (!currentParent && !newParent.IsValid())
-        {
-            // No change in parent.
-            return;
-        }
-
-        if (currentParent && currentParent->GetAssociatedEntityId() == newParent)
-        {
-            // No change in parent.
-            return;
-        }
-
-        DetachThis();
-
-        if (newParent.IsValid())
-        {
-            CComponentEntityObject* componentEntity = CComponentEntityObject::FindObjectForEntity(newParent);
-
-            if (componentEntity)
-            {
-                // The action is originating from Sandbox, so ignore the return events.
-                EditorActionScope transformChange(m_transformReentryGuard);
-
-                componentEntity->AttachChild(this);
-            }
-        }
-
-        InvalidateTM(0);
-    }
 }
 
 void CComponentEntityObject::OnMeshCreated(const AZ::Data::Asset<AZ::Data::AssetData>& asset)

Code/Sandbox/Plugins/EditorAssetImporter/AssetBrowserContextProvider.cpp

@@ -75,7 +75,7 @@ namespace AZ
             return;
         }
 
-        openers.push_back({ "Lumberyard_FBX_Settings_Edit", "Edit Settings...", QIcon(), [](const char* fullSourceFileNameInCallback, const AZ::Uuid& /*sourceUUID*/)
+        openers.push_back({ "O3DE_FBX_Settings_Edit", "Edit Settings...", QIcon(), [](const char* fullSourceFileNameInCallback, const AZ::Uuid& /*sourceUUID*/)
         {
             AZStd::string sourceName(fullSourceFileNameInCallback); // because the below call absolutely requires a AZStd::string.
             AssetImporterPlugin::GetInstance()->EditImportSettings(sourceName);

Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterPlugin.cpp

@@ -88,6 +88,12 @@ AZStd::unique_ptr<AZ::DynamicModuleHandle> AssetImporterPlugin::LoadSceneLibrary
 void AssetImporterPlugin::EditImportSettings(const AZStd::string& sourceFilePath)
 {
     const QtViewPane* assetImporterPane = GetIEditor()->OpenView(m_toolName.c_str());
+
+    if(!assetImporterPane)
+    {
+        return;
+    }
+
     AssetImporterWindow* assetImporterWindow = qobject_cast<AssetImporterWindow*>(assetImporterPane->Widget());
     if (!assetImporterWindow)
     {

Code/Sandbox/Plugins/FBXPlugin/FBXExporter.cpp

@@ -29,7 +29,7 @@ static const float      s_CONVERSION_BAKING_SAMPLE_RATE = 30.0f;
 // IMPORT_PRE/POST_ROTATIONS determined by experimentation with fbx2015 in Maya and Max.
 // We are transforming a Z-axis forward (Max/Maya) to a negative Y-axis forward camera (Editor).
 // Analytically this shold involve a preRotation of -90 degrees around the x-axis.
-// For Y-Up scenes, our Lumberyard Tools inserts an additional 180 rotation around the Y-axis when orienting .cgf files. We need to
+// For Y-Up scenes, our Open 3D Engine Tools inserts an additional 180 rotation around the Y-axis when orienting .cgf files. We need to
 // 'undo' for FBX anim curves. This does not apply to cameras which do not use .cgf files
 static const FbxVector4 s_PRE_ROTATION_FOR_YUP_SCENES (-90.0f, .0f, .0f);
 static const FbxVector4 s_POST_ROTATION_FOR_YUP_OBJECTS(-90.0f, 180.0f, .0f);
@@ -759,7 +759,7 @@ void CFBXExporter::FillAnimationData(Export::Object* pObject, FbxNode* pNode, [[
                 // special handling for Focal Length - we convert it to FoV for use in-engine (including switching the paramType)
                 // We handle this because Maya 2015 doesn't save Angle of View or Field of View animation in FBX - it only uses FocalLength.
                 entityData.dataType = Export::AnimParamType::FOV;
-                // Lumberyard field of view is the vertical angle
+                // Open 3D Engine field of view is the vertical angle
                 pNode->GetCamera()->SetApertureMode(FbxCamera::eVertical);
                 entityData.keyValue = aznumeric_cast<float>(pNode->GetCamera()->ComputeFieldOfView(entityData.keyValue));
             }
@@ -821,7 +821,7 @@ bool CFBXExporter::ImportFromFile(const char* filename, Export::IData* pData)
         return false;
     }
 
-    // record the original axis system used in the import file and then convert the file to Lumberyard's coord system,
+    // record the original axis system used in the import file and then convert the file to Open 3D Engine's coord system,
     // which matches Max's (Z-Up, negative Y-forward cameras)
     int upSign = 1;
     FbxAxisSystem importFileAxisSystem = pFBXScene->GetGlobalSettings().GetAxisSystem();
@@ -877,13 +877,13 @@ bool CFBXExporter::ImportFromFile(const char* filename, Export::IData* pData)
 
                                 if (pCamera)
                                 {
-                                    // Converts Y-Up, -Z-forward cameras to Lumberyards Z-Up, Y-forward cameras
+                                    // Converts Y-Up, -Z-forward cameras to Open 3D Engine Z-Up, Y-forward cameras
                                     // It is needed regardless of the scene up vector
                                     pNode->SetPostRotation(FbxNode::eSourcePivot, s_POST_ROTATION_FOR_ZFORWARD_CAMERAS);
                                 }
                                 else
                                 {
-                                    // Objects from a Y-Up scene (i.e. not cameras). 'undo' the extra transform that the Lumberyard Tool
+                                    // Objects from a Y-Up scene (i.e. not cameras). 'undo' the extra transform that the Open 3D Engine Tool
                                     // bakes in to .cgf files from YUp scenes.
                                     pNode->SetPostRotation(FbxNode::eSourcePivot, s_POST_ROTATION_FOR_YUP_OBJECTS);
                                 }

Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings_Ios.h

@@ -131,7 +131,7 @@ namespace ProjectSettingsTool
             : m_bundleName("")
             , m_bundleDisplayName("")
             , m_executableName("")
-            , m_bundleIdentifier("com.amazon.lumberyard.UnknownProject")
+            , m_bundleIdentifier("com.amazon.o3de.UnknownProject")
             , m_versionName("1.0.0")
             , m_versionNumber("1.0.0")
             , m_developmentRegion("en_US")