Merge branch 'main' into Prefab/CreatePrefab

Code/CryEngine/Cry3DEngine/cvars.cpp

@@ -922,7 +922,7 @@ void CVars::Init()
         "Will not render CGFs past the given amount of drawcalls\n"
         "(<=0 off (default), >0 draw calls limit)");
 
-    REGISTER_CVAR(e_CheckOctreeObjectsBoxSize, 1, VF_NULL, "CryWarning for crazy sized COctreeNode m_objectsBoxes");
+    REGISTER_CVAR(e_CheckOctreeObjectsBoxSize, 1, VF_NULL, "Warning for crazy sized COctreeNode m_objectsBoxes");
     REGISTER_CVAR(e_DebugGeomPrep, 0, VF_NULL,  "enable logging of Geom preparation");
     DefineConstIntCVar(e_GeomCaches, 1, VF_NULL, "Activates drawing of geometry caches");
     REGISTER_CVAR(e_GeomCacheBufferSize, 128, VF_CHEAT, "Geometry cache stream buffer upper limit size in MB. Default: 128");

Code/CryEngine/CrySystem/AZCrySystemInitLogSink.cpp

@@ -35,7 +35,7 @@ namespace AZ
             }
 
             AZ::OSString msgBoxMessage;
-            msgBoxMessage.append("CrySystem could not initialize correctly for the following reason(s):");
+            msgBoxMessage.append("O3DE could not initialize correctly for the following reason(s):");
 
             for (const AZ::OSString& errMsg : m_errorStringsCollected)
             {
@@ -47,7 +47,7 @@ namespace AZ
             Trace::Output(nullptr, msgBoxMessage.c_str());
             Trace::Output(nullptr, "\n==================================================================\n");
 
-            EBUS_EVENT(AZ::NativeUI::NativeUIRequestBus, DisplayOkDialog, "CrySystem Initialization Failed", msgBoxMessage.c_str(), false);
+            EBUS_EVENT(AZ::NativeUI::NativeUIRequestBus, DisplayOkDialog, "O3DE Initialization Failed", msgBoxMessage.c_str(), false);
         }
     } // namespace Debug
 } // namespace AZ

Code/CryEngine/CrySystem/SystemWin32.cpp

@@ -605,7 +605,7 @@ void CSystem::DebugStats([[maybe_unused]] bool checkpoint, [[maybe_unused]] bool
     {
         if (!dbgmodules[i].handle)
         {
-            CryLogAlways("WARNING: <CrySystem> CSystem::DebugStats: NULL handle for %s", dbgmodules[i].name.c_str());
+            CryLogAlways("WARNING: CSystem::DebugStats: NULL handle for %s", dbgmodules[i].name.c_str());
             nolib++;
             continue;
         }
@@ -642,7 +642,7 @@ void CSystem::DebugStats([[maybe_unused]] bool checkpoint, [[maybe_unused]] bool
         }
         else
         {
-            CryLogAlways("WARNING: <CrySystem> CSystem::DebugStats: could not retrieve function from DLL %s", dbgmodules[i].name.c_str());
+            CryLogAlways("WARNING: CSystem::DebugStats: could not retrieve function from DLL %s", dbgmodules[i].name.c_str());
             nolib++;
         };
 #endif
@@ -1066,7 +1066,7 @@ void CSystem::FatalError(const char* format, ...)
 
     if (szSysErrorMessage)
     {
-        CryLogAlways("<CrySystem> Last System Error: %s", szSysErrorMessage);
+        CryLogAlways("Last System Error: %s", szSysErrorMessage);
     }
 
     if (GetUserCallback())

Code/Framework/AzCore/AzCore/Asset/AssetManager.cpp

@@ -1117,7 +1117,7 @@ namespace AZ
             return asset;
         }
 
-        void AssetManager::UpdateDebugStatus(AZ::Data::Asset<AZ::Data::AssetData> asset)
+        void AssetManager::UpdateDebugStatus(const AZ::Data::Asset<AZ::Data::AssetData>& asset)
         {
             if(!m_debugAssetEvents)
             {

Code/Framework/AzCore/AzCore/Asset/AssetManager.h

@@ -358,7 +358,7 @@ namespace AZ
 
             Asset<AssetData> GetAssetInternal(const AssetId& assetId, const AssetType& assetType, AssetLoadBehavior assetReferenceLoadBehavior, const AssetLoadParameters& loadParams = AssetLoadParameters{}, AssetInfo assetInfo = AssetInfo(), bool signalLoaded = false);
 
-            void UpdateDebugStatus(AZ::Data::Asset<AZ::Data::AssetData> asset);
+            void UpdateDebugStatus(const AZ::Data::Asset<AZ::Data::AssetData>& asset);
 
             /**
             * Gets a root asset and dependencies as individual async loads if necessary.

Code/Framework/AzCore/AzCore/Debug/EventTrace.h

@@ -42,9 +42,8 @@ namespace AZ
     }
 }
 
-#define AZ_TRACE_METHOD_NAME_CATEGORY(name, category) AZ::Debug::EventTrace::ScopedSlice AZ_JOIN(ScopedSlice__, __LINE__)(name, category);
-
 #ifdef AZ_PROFILE_TELEMETRY
+#   define AZ_TRACE_METHOD_NAME_CATEGORY(name, category) AZ::Debug::EventTrace::ScopedSlice AZ_JOIN(ScopedSlice__, __LINE__)(name, category);
 #   define AZ_TRACE_METHOD_NAME(name) \
         AZ_TRACE_METHOD_NAME_CATEGORY(name, "") \
         AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzTrace, name)
@@ -53,6 +52,7 @@ namespace AZ
         AZ_TRACE_METHOD_NAME_CATEGORY(AZ_FUNCTION_SIGNATURE, "") \
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzTrace)
 #else
+#   define AZ_TRACE_METHOD_NAME_CATEGORY(name, category)
 #   define AZ_TRACE_METHOD_NAME(name) AZ_TRACE_METHOD_NAME_CATEGORY(name, "")
 #   define AZ_TRACE_METHOD() AZ_TRACE_METHOD_NAME(AZ_FUNCTION_SIGNATURE)
 #endif

Code/LauncherUnified/Launcher.cpp

@@ -313,7 +313,7 @@ namespace O3DELauncher
                 return "Failed to initialize the CrySystem Interface";
 
             case ReturnCode::ErrCryEnvironment:
-                return "Failed to initialize the CryEngine global environment";
+                return "Failed to initialize the global environment";
 
             case ReturnCode::ErrAssetProccessor:
                 return "Failed to connect to AssetProcessor while the /Amazon/AzCore/Bootstrap/wait_for_connect value is 1\n."

Code/Sandbox/Editor/CryEdit.cpp

@@ -5702,7 +5702,7 @@ extern "C" int AZ_DLL_EXPORT CryEditMain(int argc, char* argv[])
         int exitCode = 0;
 
         BOOL didCryEditStart = CCryEditApp::instance()->InitInstance();
-        AZ_Error("Editor", didCryEditStart, "CryEditor did not initialize correctly, and will close."
+        AZ_Error("Editor", didCryEditStart, "O3DE Editor did not initialize correctly, and will close."
             "\nThis could be because of incorrectly configured components, or missing required gems."
             "\nSee other errors for more details.");
 

Code/Sandbox/Editor/CryEditDoc.cpp

@@ -1931,7 +1931,7 @@ void CCryEditDoc::Fetch(const QString& holdName, const QString& relativeHoldPath
     if (!LoadXmlArchiveArray(arrXmlAr, holdFilename, holdPath))
     {
         QMessageBox::critical(QApplication::activeWindow(), "Error", "The temporary 'Hold' level failed to load successfully.  Your level might be corrupted, you should restart the Editor.", QMessageBox::Ok);
-        AZ_Error("CryEditDoc", false, "Fetch failed to load the Xml Archive");
+        AZ_Error("EditDoc", false, "Fetch failed to load the Xml Archive");
         return;
     }