Merge branch 'main' into MultiplayerPipeline

Code/CryEngine/CrySystem/Huffman.cpp

@@ -464,4 +464,4 @@ static void printModel(const HuffmanTreeNode* const pNodes, const HuffmanSymbolC
             printf("\n");
         }
     }
-}*/
+}*/

Code/CryEngine/CrySystem/IOSConsole.mm

@@ -91,4 +91,4 @@ void CIOSConsole::PutText( int x, int y, const char * msg )
 void CIOSConsole::EndDraw() {
     // Do Nothing
 }
-#endif // IOS
+#endif // IOS

Code/CryEngine/CrySystem/LZ4Decompressor.cpp

@@ -26,4 +26,4 @@ bool CLZ4Decompressor::DecompressData(const char* pIn, char* pOut, const uint ou
 void CLZ4Decompressor::Release()
 {
     delete this;
-}
+}

Code/CryEngine/CrySystem/MiniGUI/MiniButton.cpp

@@ -313,4 +313,4 @@ bool CMiniButton::SetConnectedCtrl(IMiniCtrl* pConnectedCtrl)
     return true;
 }
 
-MINIGUI_END
+MINIGUI_END

Code/CryEngine/CrySystem/MiniGUI/MiniInfoBox.cpp

@@ -171,4 +171,4 @@ void CMiniInfoBox::AutoResize()
     m_requiresResize = false;
 }
 
-MINIGUI_END
+MINIGUI_END

Code/CryEngine/CrySystem/MiniGUI/MiniMenu.cpp

@@ -361,4 +361,4 @@ void CMiniMenu::AddSubCtrl(IMiniCtrl* pCtrl)
     // Call parent
     CMiniButton::AddSubCtrl(pCtrl);
 }
-MINIGUI_END
+MINIGUI_END

Code/CryEngine/CrySystem/RemoteConsole/RemoteConsole_impl.inl

@@ -182,4 +182,4 @@ void CRemoteConsole::RegisterListener(IRemoteConsoleListener* pListener, const c
 void CRemoteConsole::UnregisterListener(IRemoteConsoleListener* pListener)
 {
     m_listener.Remove(pListener);
-}
+}

Code/CryEngine/CrySystem/Sampler.cpp

@@ -284,4 +284,4 @@ void CSampler::LogSampledData()
 }
 
 
-#endif // defined(WIN32)
+#endif // defined(WIN32)

Code/CryEngine/CrySystem/SystemInit.cpp

@@ -247,7 +247,7 @@ CUNIXConsole* pUnixConsole;
 
 #define LOCALIZATION_TRANSLATIONS_LIST_FILE_NAME "Libs/Localization/localization.xml"
 
-#define LOAD_LEGACY_RENDERER_FOR_EDITOR true // If you set this to false you must for now also set 'ed_useAtomNativeViewport' to true (see /Code/Sandbox/Editor/ViewManager.cpp)
+#define LOAD_LEGACY_RENDERER_FOR_EDITOR false // If you set this to true you must also set 'ed_useAtomNativeViewport' to false (see /Code/Sandbox/Editor/ViewManager.cpp)
 #define LOAD_LEGACY_RENDERER_FOR_LAUNCHER false
 
 //////////////////////////////////////////////////////////////////////////
@@ -1294,7 +1294,7 @@ bool CSystem::OpenRenderLibrary(int type, const SSystemInitParams& initParams)
     const char* libname = "";
     if (AZ::Interface<AzFramework::AtomActiveInterface>::Get())
     {
-        libname = "CryRenderOther";
+        libname = DLL_RENDERER_NULL;
     }
     else if (type == R_DX9_RENDERER)
     {

Code/CryEngine/CrySystem/ViewSystem/DebugCamera.cpp

@@ -356,4 +356,4 @@ void DebugCamera::MovePosition(const Vec3& offset)
     m_position += m_view.GetColumn2() * offset.z;
 }
 
-} // namespace LegacyViewSystem
+} // namespace LegacyViewSystem

Code/CryEngine/CrySystem/ViewSystem/DebugCamera.h

@@ -80,4 +80,4 @@ inline bool DebugCamera::IsFree()
     return m_cameraMode == DebugCamera::ModeFree;
 }
 
-} // namespace LegacyViewSystem
+} // namespace LegacyViewSystem