Integrating github/staging through commit 5f214be

Code/Tools/AssetProcessor/native/ui/ProductAssetDetailsPanel.cpp

@@ -112,7 +112,7 @@ namespace AssetProcessor
             [&](AzToolsFramework::AssetDatabase::SourceDatabaseEntry& sourceEntry)
         {
             assetId = AZ::Data::AssetId(sourceEntry.m_sourceGuid, productItemData->m_databaseInfo.m_subID);
-            // Use a decimal value to display the sub ID and not hex. Lumberyard is not consistent about
+            // Use a decimal value to display the sub ID and not hex. Open 3D Engine is not consistent about
             // how sub IDs are displayed, so it's important to double check what format a sub ID is in before using it elsewhere.
             m_ui->productAssetIdValueLabel->setText(assetId.ToString<AZStd::string>(AZ::Data::AssetId::SubIdDisplayType::Decimal).c_str());
 

Code/Tools/AssetProcessor/native/ui/SourceAssetTreeModel.cpp

@@ -76,7 +76,7 @@ namespace AssetProcessor
 
         AzFramework::StringFunc::AssetDatabasePath::Join(scanFolder.m_scanFolder.c_str(), fullPath.c_str(), fullPath, true, false);
 
-        // It's common for Lumberyard game projects and scan folders to be in a subfolder
+        // It's common for Open 3D Engine game projects and scan folders to be in a subfolder
         // of the engine install. To improve readability of the source files, strip out
         // that portion of the path if it overlaps.
         if (!m_assetRootSet)

Code/Tools/AssetProcessor/native/ui/style/AssetProcessor.qrc

@@ -16,6 +16,6 @@
         <file>AssetProcessor_arrow_down.svg</file>
         <file>AssetProcessor_arrow_up.svg</file>
         <file>AssetProcessor_refresh.png</file>
-        <file>lyassetprocessor.png</file>
+        <file>o3de_assetprocessor.png</file>
     </qresource>
 </RCC>

Code/Tools/AssetProcessor/native/ui/style/lyassetprocessor.ico

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

Code/Tools/AssetProcessor/native/ui/style/lyassetprocessor.png

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

Code/Tools/AssetProcessor/native/ui/style/o3de_assetprocessor.ico

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

Code/Tools/AssetProcessor/native/ui/style/o3de_assetprocessor.png

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