Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher

Code/.p4ignore

@@ -3,4 +3,4 @@ SDKs
 
 #ColinB (8/26)- I know there are depot files that this will ignore... But these files should not be
 #here, they should all be in 3rdParty... so we will ignore them until I can move them, it should
-#be OK for now because they shouldn't change at all anyway.
+#be OK for now because they shouldn't change at all anyway.

Code/CryEngine/Cry3DEngine/FogVolumeRenderNode_Jobs.cpp

@@ -396,4 +396,4 @@ void CFogVolumeRenderNode::GetVolumetricFogColorBox(const Vec3& worldPos, const
             resultColor = ColorF(m_cachedFogColor.r, m_cachedFogColor.g, m_cachedFogColor.b, min(fog, 1.0f));
         }
     }
-}
+}

Code/CryEngine/Cry3DEngine/GeomCacheMeshManager.cpp

@@ -325,4 +325,4 @@ bool CGeomCacheMeshManager::ReadMeshColors(CGeomCacheStreamReader& reader, const
     return true;
 }
 
-#endif
+#endif

Code/CryEngine/Cry3DEngine/GeomCacheRenderNode.cpp

@@ -1488,4 +1488,4 @@ void CGeomCacheRenderNode::OnGeomCacheStaticDataUnloaded()
     Clear(false);
 }
 
-#endif
+#endif

Code/CryEngine/Cry3DEngine/ObjManDraw.cpp

@@ -14,4 +14,4 @@
 // Description : Draw static objects (vegetations)
 
 
-#include "Cry3DEngine_precompiled.h"
+#include "Cry3DEngine_precompiled.h"

Code/CryEngine/Cry3DEngine/PostProcessEffects.cpp

@@ -94,4 +94,4 @@ void C3DEngine::DisablePostEffects()
             }
         }
     }
-}
+}

Code/CryEngine/Cry3DEngine/Tests/MockValidationTest.cpp

@@ -22,4 +22,4 @@ TEST(MockValidationTests, SystemMock_Compiles)
 TEST(MockValidationTests, LogMock_Compiles)
 {
     LogMock mockLog;
-}
+}

Code/CryEngine/CryCommon/Algorithm.h

@@ -71,4 +71,4 @@ namespace std17
     }
 }
 
-#endif // CRYINCLUDE_CRYCOMMON_ALGORITHM_H
+#endif // CRYINCLUDE_CRYCOMMON_ALGORITHM_H

Code/CryEngine/CryCommon/Bezier.h

@@ -318,4 +318,4 @@ namespace Bezier
     }
 }
 
-#endif
+#endif

Code/CryEngine/CryCommon/CREFogVolume.h

@@ -63,4 +63,4 @@ public:
 };
 
 
-#endif // #ifndef _CREFOGVOLUME_
+#endif // #ifndef _CREFOGVOLUME_

Code/CryEngine/CryCommon/CREVolumeObject.h

@@ -67,4 +67,4 @@ public:
     _smart_ptr<IRenderMesh> m_pHullMesh;
 };
 
-#endif // #ifndef _CREVOLUMEOBJECT_
+#endif // #ifndef _CREVOLUMEOBJECT_

Code/CryEngine/CryCommon/CREWaterOcean.h

@@ -54,4 +54,4 @@ private:
 };
 
 
-#endif
+#endif

Code/CryEngine/CryCommon/HeightmapUpdateNotificationBus.h

@@ -35,4 +35,4 @@ namespace AZ
     };
 
     typedef AZ::EBus<HeightmapUpdateNotification> HeightmapUpdateNotificationBus;
-}
+}

Code/CryEngine/CryCommon/IMovieSystem.h

@@ -327,7 +327,16 @@ struct IMovieCallback
 */
 struct IAnimTrack
 {
-    AZ_RTTI(IAnimTrack, "{AA0D5170-FB28-426F-BA13-7EFF6BB3AC67}")
+    AZ_RTTI(IAnimTrack, "{AA0D5170-FB28-426F-BA13-7EFF6BB3AC67}");
+    AZ_CLASS_ALLOCATOR(IAnimTrack, AZ::SystemAllocator, 0);
+
+    static void Reflect(AZ::ReflectContext* context)
+    {
+        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
+        {
+            serializeContext->Class<IAnimTrack>();
+        }
+    }
 
     //! Flags that can be set on animation track.
     enum EAnimTrackFlags
@@ -594,7 +603,16 @@ struct IAnimNodeOwner
 struct IAnimNode
 {
 public:
-    AZ_RTTI(IAnimNode, "{0A096354-7F26-4B18-B8C0-8F10A3E0440A}")
+    AZ_RTTI(IAnimNode, "{0A096354-7F26-4B18-B8C0-8F10A3E0440A}");
+    AZ_CLASS_ALLOCATOR(IAnimNode, AZ::SystemAllocator, 0);
+
+    static void Reflect(AZ::ReflectContext* context)
+    {
+        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
+        {
+            serializeContext->Class<IAnimNode>();
+        }
+    }
 
     //////////////////////////////////////////////////////////////////////////
     // Supported params.
@@ -922,7 +940,7 @@ struct IAnimSequence
 
     static void Reflect(AZ::ReflectContext* context)
     {
-        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context); serializeContext != nullptr)
+        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
         {
             serializeContext->Class<IAnimSequence>();
         }

Code/CryEngine/CryCommon/LocalizationManagerBus.inl

@@ -83,4 +83,4 @@ void LocalizationManagerRequests::LocalizeAndSubstitute(const AZStd::string& loc
 
     outLocalizedString = locString;
     LocalizationManagerRequestBus::Broadcast(&LocalizationManagerRequestBus::Events::LocalizeAndSubstituteInternal, outLocalizedString, keys, values);
-}
+}

Code/CryEngine/CryCommon/LyShine/Bus/UiCheckboxBus.h

@@ -96,4 +96,4 @@ public: // member functions
     virtual void OnCheckboxStateChange([[maybe_unused]] bool checked) {}
 };
 
-typedef AZ::EBus<UiCheckboxNotifications> UiCheckboxNotificationBus;
+typedef AZ::EBus<UiCheckboxNotifications> UiCheckboxNotificationBus;

Code/CryEngine/CryCommon/LyShine/Bus/UiDropdownBus.h

@@ -124,4 +124,4 @@ public: // member functions
     virtual void OnDropdownValueChanged([[maybe_unused]] AZ::EntityId option) {}
 };
 
-typedef AZ::EBus<UiDropdownNotifications> UiDropdownNotificationBus;
+typedef AZ::EBus<UiDropdownNotifications> UiDropdownNotificationBus;

Code/CryEngine/CryCommon/LyShine/Bus/UiDropdownOptionBus.h

@@ -63,4 +63,4 @@ public: // member functions
     virtual void OnDropdownOptionSelected() {}
 };
 
-typedef AZ::EBus<UiDropdownOptionNotifications> UiDropdownOptionNotificationBus;
+typedef AZ::EBus<UiDropdownOptionNotifications> UiDropdownOptionNotificationBus;

Code/CryEngine/CryCommon/LyShine/Bus/UiRadioButtonBus.h

@@ -83,4 +83,4 @@ public: // member functions
     virtual void OnRadioButtonStateChange([[maybe_unused]] bool checked) {}
 };
 
-typedef AZ::EBus<UiRadioButtonNotifications> UiRadioButtonNotificationBus;
+typedef AZ::EBus<UiRadioButtonNotifications> UiRadioButtonNotificationBus;

Code/CryEngine/CryCommon/LyShine/Bus/UiRadioButtonCommunicationBus.h

@@ -38,4 +38,4 @@ public: // static member data
     static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
 };
 
-typedef AZ::EBus<UiRadioButtonCommunicationInterface> UiRadioButtonCommunicationBus;
+typedef AZ::EBus<UiRadioButtonCommunicationInterface> UiRadioButtonCommunicationBus;

Code/CryEngine/CryCommon/LyShine/Bus/UiRadioButtonGroupBus.h

@@ -75,4 +75,4 @@ public: // member functions
     virtual void OnRadioButtonGroupStateChange([[maybe_unused]] AZ::EntityId checkedRadioButton) {}
 };
 
-typedef AZ::EBus<UiRadioButtonGroupNotifications> UiRadioButtonGroupNotificationBus;
+typedef AZ::EBus<UiRadioButtonGroupNotifications> UiRadioButtonGroupNotificationBus;

Code/CryEngine/CryCommon/LyShine/Bus/UiRadioButtonGroupCommunicationBus.h

@@ -44,4 +44,4 @@ public: // static member data
     static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
 };
 
-typedef AZ::EBus<UiRadioButtonGroupCommunicationInterface> UiRadioButtonGroupCommunicationBus;
+typedef AZ::EBus<UiRadioButtonGroupCommunicationInterface> UiRadioButtonGroupCommunicationBus;

Code/CryEngine/CryCommon/LyShine/Bus/UiSliderBus.h

@@ -107,4 +107,4 @@ public: // member functions
     virtual void OnSliderValueChanged([[maybe_unused]] float value) {}
 };
 
-typedef AZ::EBus<UiSliderNotifications> UiSliderNotificationBus;
+typedef AZ::EBus<UiSliderNotifications> UiSliderNotificationBus;

Code/CryEngine/CryCommon/Maestro/Bus/EditorSequenceComponentBus.h

@@ -57,4 +57,4 @@ namespace Maestro
 // defined in the bus header so we can refer to it in the Editor code
 #define EditorSequenceComponentTypeId "{C02DC0E2-D0F3-488B-B9EE-98E28077EC56}"
 
-} // namespace Maestro
+} // namespace Maestro

Code/CryEngine/CryCommon/Maestro/Bus/SequenceAgentComponentBus.h

@@ -97,4 +97,4 @@ namespace AZStd
             return retVal;
         }
     };
-}
+}

Code/CryEngine/CryCommon/Maestro/Types/AnimNodeType.h

@@ -52,4 +52,4 @@ enum class AnimNodeType
     Num
 };
 
-#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMNODETYPE_H
+#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMNODETYPE_H

Code/CryEngine/CryCommon/Maestro/Types/AnimValue.h

@@ -42,4 +42,4 @@ enum class AnimValue
 };
 
 
-#endif CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUE_H
+#endif CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUE_H

Code/CryEngine/CryCommon/Maestro/Types/AnimValueType.h

@@ -45,4 +45,4 @@ enum class AnimValueType
 };
 
 
-#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUETYPE_H
+#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUETYPE_H

Code/CryEngine/CryCommon/Maestro/Types/AssetBlendKey.h

@@ -35,4 +35,4 @@ struct IAssetBlendKey
 };
 
     AZ_TYPE_INFO_SPECIALIZE(IAssetBlendKey, "{15B82C3A-6DB8-466F-AF7F-18298FCD25FD}");
-}
+}

Code/CryEngine/CryCommon/Maestro/Types/AssetBlends.h

@@ -77,4 +77,4 @@ namespace Maestro
         }
     };
 
-} // namespace Maestro
+} // namespace Maestro

Code/CryEngine/CryCommon/Maestro/Types/SequenceType.h

@@ -25,4 +25,4 @@ enum class SequenceType
     SequenceComponent     = 1         // Sequence Component on an AZ::Entity
 };
 
-#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_SEQUENCETYPE_H
+#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_SEQUENCETYPE_H

Code/CryEngine/CryCommon/Mocks/StubTimer.h

@@ -110,4 +110,4 @@ private:
     CTimeValue m_frameStartTime;
     float m_frameTime;
     float m_frameRate;
-};
+};

Code/CryEngine/CryCommon/Platform/Mac/crycommon_enginesettings_mac_files.cmake

@@ -12,4 +12,4 @@
 set(FILES
     ../../EngineSettingsBackendApple.cpp
     ../../EngineSettingsBackendApple.h
-)
+)

Code/CryEngine/CryCommon/Platform/Windows/crycommon_enginesettings_windows_files.cmake

@@ -12,4 +12,4 @@
 set(FILES
     ../../EngineSettingsBackendWin32.cpp
     ../../EngineSettingsBackendWin32.h
-)
+)

Code/CryEngine/CryCommon/Platform/Windows/crycommon_windows_files.cmake

@@ -10,4 +10,4 @@
 #
 
 set(FILES
-)
+)

Code/CryEngine/CryCommon/RenderBus.h

@@ -120,4 +120,4 @@ namespace AZ
     };
 
     using RenderScreenshotNotificationBus = AZ::EBus<RenderScreenshotNotifications>;
-}
+}

Code/CryEngine/CryCommon/RenderContextConfig.h

@@ -83,4 +83,4 @@ namespace AzRTT
         //! confirm if user wants to use texture size larger than MaxRecommendedRenderTargetSize
         bool ValidateTextureSize(void* newValue, const AZ::Uuid& valueType);
     };
-}
+}

Code/CryEngine/CryCommon/Serialization/Decorators/Resources.h

@@ -64,4 +64,4 @@ namespace Serialization
         using Serialization::ForceFeedbackIdName;
     }
 }
-#endif // CRYINCLUDE_CRYCOMMON_SERIALIZATION_DECORATORS_RESOURCES_H
+#endif // CRYINCLUDE_CRYCOMMON_SERIALIZATION_DECORATORS_RESOURCES_H

Code/CryEngine/CryCommon/Serialization/NetScriptSerialize.h

@@ -24,4 +24,4 @@ namespace Serialization
     };
 }
 
-#endif
+#endif

Code/CryEngine/CryCommon/StereoRendererBus.h

@@ -44,4 +44,4 @@ namespace AZ
     };
 
     using StereoRendererRequestBus = EBus < StereoRendererBus >;
-}
+}

Code/CryEngine/CryCommon/TPool.h

@@ -85,4 +85,4 @@ public:
     PodArray<T*> m_lstUsed;
     T* m_pPool;
     int m_nPoolSize;
-};
+};

Code/CryEngine/CryCommon/VRCommon.h

@@ -256,4 +256,4 @@ namespace AZ
 
     }//namespace VR
     AZ_TYPE_INFO_SPECIALIZE(VR::ControllerIndex, "{90D4C80E-A1CC-4DBF-A131-0082C75835E8}");
-}//namespace AZ
+}//namespace AZ

Code/CryEngine/CryCommon/crycommon_enginesettings_files.cmake

@@ -24,4 +24,4 @@ set(FILES
 # Remove files that cause #define collisions on Mac due to multiple inclusions of 'AppleSpecific.h' and include orders
 set(SKIP_UNITY_BUILD_INCLUSION_FILES
     SettingsManagerHelpers.cpp
-)
+)

Code/CryEngine/CryCommon/crycommon_testing_files.cmake

@@ -23,4 +23,4 @@ set(FILES
     Mocks/ITextureMock.h
     Mocks/IRemoteConsoleMock.h
     Mocks/MockCGFContent.h
-)
+)

Code/CryEngine/CryFont/CryFont.def

@@ -1,3 +1,3 @@
 EXPORTS
 	ModuleInitISystem @2
-	CryModuleGetMemoryInfo @8
+	CryModuleGetMemoryInfo @8

Code/CryEngine/CrySystem/CmdLine.cpp

@@ -185,6 +185,7 @@ string CCmdLine::Next(char*& src)
             return string(org, src - 1);
 
         case ' ':
+            ch = *src++;
             continue;
         default:
             org = src - 1;

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

@@ -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

Code/CryEngine/RenderDll/Common/DeferredRenderUtils.h

@@ -39,4 +39,4 @@ private:
     static void SphereTessR(Vec3& v0, Vec3& v1, Vec3& v2, int depth, t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff);
 };
 
-#endif
+#endif

Code/CryEngine/RenderDll/Common/Memory/VRAMDrillerBus.h

@@ -90,4 +90,4 @@ namespace Render
 } // namespace Render
 
 #endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_MEMORY_VRAMDRILLERBUS_H
-#pragma once
+#pragma once

Code/CryEngine/RenderDll/Common/PostProcess/PostProcessUtils.cpp

@@ -685,4 +685,4 @@ Matrix44& SPostEffectsUtils::GetColorMatrix()
     return m_pColorMat;
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////////////

Code/CryEngine/RenderDll/Common/PostProcess/PostProcessUtils.h

@@ -309,4 +309,4 @@ private:
     static CTexture* m_UpscaleTarget;
 };
 
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_POSTPROCESS_POSTPROCESSUTILS_H
+#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_POSTPROCESS_POSTPROCESSUTILS_H

Code/CryEngine/RenderDll/Common/RendElements/AbstractMeshElement.cpp

@@ -71,4 +71,4 @@ void AbstractMeshElement::DrawMeshWireframe()
     gcpRendD3D->FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, nVertexBufferCount, 0, nIndexBufferCount);
 
     gcpRendD3D->FX_SetState(nState);
-}
+}

Code/CryEngine/RenderDll/Common/RendElements/CREDeferredShading.cpp

@@ -47,4 +47,4 @@ void CREDeferredShading::mfReset()
 
 void CREDeferredShading::mfActivate([[maybe_unused]] int iProcess)
 {
-}
+}

Code/CryEngine/RenderDll/Common/RendElements/CREGeomCache.cpp

@@ -240,4 +240,4 @@ bool CREGeomCache::GetGeometryInfo(SGeometryInfo &streams)
     return true;
 }
 
-#endif
+#endif

Code/CryEngine/RenderDll/Common/RendElements/CREHDRProcess.cpp

@@ -47,4 +47,4 @@ void CREHDRProcess::mfReset()
 
 void CREHDRProcess::mfActivate([[maybe_unused]] int iProcess)
 {
-}
+}

Code/CryEngine/RenderDll/Common/RendElements/OpticsFactory.cpp

@@ -58,4 +58,4 @@ IOpticsElementBase*  COpticsFactory::Create(EFlareType type) const
     default:
         return NULL;
     }
-}
+}

Code/CryEngine/RenderDll/Common/RendElements/OpticsPredef.hpp

@@ -74,4 +74,4 @@ public:
         static OpticsPredef instance;
         return &instance;
     }
-};
+};

Code/CryEngine/RenderDll/Common/RendElements/Utils/PolygonMath2D.cpp

@@ -850,4 +850,4 @@ EPolygonInCircle2D PolygonInCircle2D(const Vec2& center, const float radius, con
     }
 
     return state;
-}//-------------------------------------------------------------------------------------------------
+}//-------------------------------------------------------------------------------------------------

Code/CryEngine/RenderDll/Common/RendElements/Utils/PolygonMath2D.h

@@ -150,4 +150,4 @@ enum EPolygonInCircle2D
 
 EPolygonInCircle2D PolygonInCircle2D(const Vec2& center, const float radius, const Vec2* pPolygon, const int numPts);
 
-#endif // _POLYGON_MATH_2D_
+#endif // _POLYGON_MATH_2D_

Code/CryEngine/RenderDll/Common/RendElements/Utils/SpatialHashGrid.h

@@ -285,4 +285,4 @@ void CSpatialHashGrid<T, GridSize, BucketSize>::DebugDraw()
 #endif // !RELEASE
 
 #endif // GLASSCFG_USE_HASH_GRID
-#endif // _SPATIAL_HASH_GRID_
+#endif // _SPATIAL_HASH_GRID_

Code/CryEngine/RenderDll/Common/Shaders/ShaderStaticFlags.inl

@@ -19,4 +19,4 @@ FX_STATIC_FLAG(GMEM_RT_GREATER_FOUR)
 FX_STATIC_FLAG(NO_DEPTH_CLIPPING)
 FX_STATIC_FLAG(FEATURE_FETCH_DEPTHSTENCIL)
 FX_STATIC_FLAG(GMEM_VELOCITY_BUFFER)
-FX_STATIC_FLAG(GLES3_0)
+FX_STATIC_FLAG(GLES3_0)

Code/CryEngine/RenderDll/Common/Shaders/ShadersResourcesGroups/PerFrame.h

@@ -51,4 +51,4 @@ struct PerFrameParameters
     Vec4 m_VolumetricFogDistanceParams;
 };
 
-#endif // _PER_FRAME_RESOURCE_GROUP_
+#endif // _PER_FRAME_RESOURCE_GROUP_

Code/CryEngine/RenderDll/Common/Textures/PowerOf2BlockPacker.cpp

@@ -228,4 +228,4 @@ void CPowerOf2BlockPacker::FreeContainers()
     Clear();
     stl::free_container(m_Blocks);
     stl::free_container(m_BlockBitmap);
-}
+}

Code/CryEngine/RenderDll/Common/Textures/StereoTexture.cpp

@@ -43,4 +43,4 @@ void CStereoTexture::Apply(int nTUnit, int nState, int nTexMatSlot, int nSUnit,
     {
         AZ_Assert(true, "Invalid eye provided for rendering");
     }
-}
+}

Code/CryEngine/RenderDll/Common/Textures/StereoTexture.h

@@ -37,4 +37,4 @@ public:
     void Apply(int nTUnit, int nState = -1, int nTexMatSlot = EFTT_UNKNOWN, int nSUnit = -1, SResourceView::KeyType nResViewKey = SResourceView::DefaultView, EHWShaderClass eHWSC = eHWSC_Pixel) override;
     
     AZStd::vector<CTexture*> m_textures;
-};
+};

Code/CryEngine/RenderDll/Common/Textures/TextureManager.cpp

@@ -131,78 +131,18 @@ void CTextureManager::LoadDefaultTextures()
 #endif
     };
 
-    // Reduced list of default textures to load.
-    const TextureEntry texturesFromFileReduced[] =
+    for (const TextureEntry& entry : texturesFromFile)
     {
-        {"NoTextureCM",                 "EngineAssets/TextureMsg/ReplaceMeCM.tif",                 FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"White",                       "EngineAssets/Textures/White.tif",                         FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"Gray",                        "EngineAssets/Textures/Grey.dds",                          FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"Black",                       "EngineAssets/Textures/Black.tif",                         FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"BlackAlpha",                  "EngineAssets/Textures/BlackAlpha.tif",                    FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"BlackCM",                     "EngineAssets/Textures/BlackCM.tif",                       FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"FlatBump",                    "EngineAssets/Textures/White_ddn.tif",                     FT_DONT_RELEASE | FT_DONT_STREAM | FT_TEX_NORMAL_MAP },
-        {"AverageMemoryUsage",          "EngineAssets/Icons/AverageMemoryUsage.tif",               FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"LowMemoryUsage",              "EngineAssets/Icons/LowMemoryUsage.tif",                   FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"HighMemoryUsage",             "EngineAssets/Icons/HighMemoryUsage.tif",                  FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"LivePreview",                 "EngineAssets/Icons/LivePreview.tif",                      FT_DONT_RELEASE | FT_DONT_STREAM },
-#if !defined(_RELEASE)
-        {"NoTexture",                   "EngineAssets/TextureMsg/ReplaceMe.tif",                   FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"IconTextureCompiling",        "EngineAssets/TextureMsg/TextureCompiling.tif",            FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"IconTextureCompiling_a",      "EngineAssets/TextureMsg/TextureCompiling_a.tif",          FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"IconTextureCompiling_cm",     "EngineAssets/TextureMsg/TextureCompiling_cm.tif",         FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"IconTextureCompiling_ddn",    "EngineAssets/TextureMsg/TextureCompiling_ddn.tif",        FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"IconTextureCompiling_ddna",   "EngineAssets/TextureMsg/TextureCompiling_ddna.tif",       FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"DefaultMergedDetail",         "EngineAssets/Textures/GreyAlpha.tif",                     FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"MipMapDebug",                 "EngineAssets/TextureMsg/MipMapDebug.tif",                 FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorBlue",                   "EngineAssets/TextureMsg/color_Blue.tif",                  FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorCyan",                   "EngineAssets/TextureMsg/color_Cyan.tif",                  FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorGreen",                  "EngineAssets/TextureMsg/color_Green.tif",                 FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorPurple",                 "EngineAssets/TextureMsg/color_Purple.tif",                FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorRed",                    "EngineAssets/TextureMsg/color_Red.tif",                   FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorWhite",                  "EngineAssets/TextureMsg/color_White.tif",                 FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorYellow",                 "EngineAssets/TextureMsg/color_Yellow.tif",                FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorOrange",                 "EngineAssets/TextureMsg/color_Orange.tif",                FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorMagenta",                "EngineAssets/TextureMsg/color_Magenta.tif",               FT_DONT_RELEASE | FT_DONT_STREAM },
-#else
-        {"NoTexture",                   "EngineAssets/TextureMsg/ReplaceMeRelease.tif",            FT_DONT_RELEASE | FT_DONT_STREAM },
-#endif
-    };
-
-    // Loop over the appropriate texture list and load the textures, storing them in a map keyed by texture name.
-    // Use reduced subset of textures for Other.
-    if (AZ::Interface<AzFramework::AtomActiveInterface>::Get())
-    {
-        for (const TextureEntry& entry : texturesFromFileReduced)
+        CTexture* pNewTexture = CTexture::ForName(entry.szFileName, entry.flags, eTF_Unknown);
+        if (pNewTexture)
         {
-            // Use EF_LoadTexture rather than CTexture::ForName
-            CTexture* pNewTexture = static_cast<CTexture*>(gEnv->pRenderer->EF_LoadTexture(entry.szFileName, entry.flags));
-            if (pNewTexture)
-            {
-                CCryNameTSCRC texEntry(entry.szTextureName);
-                m_DefaultTextures[texEntry] = pNewTexture;
-            }
-            else
-            {
-                AZ_Assert(false, "Error - CTextureManager failed to load default texture %s", entry.szFileName);
-                AZ_Warning("[Shaders System]", false, "Error - CTextureManager failed to load default texture %s", entry.szFileName);
-            }
+            CCryNameTSCRC texEntry(entry.szTextureName);
+            m_DefaultTextures[texEntry] = pNewTexture;
         }
-    }
-    else
-    {
-        for (const TextureEntry& entry : texturesFromFile)
+        else
         {
-            CTexture* pNewTexture = CTexture::ForName(entry.szFileName, entry.flags, eTF_Unknown);
-            if (pNewTexture)
-            {
-                CCryNameTSCRC texEntry(entry.szTextureName);
-                m_DefaultTextures[texEntry] = pNewTexture;
-            }
-            else
-            {
-                AZ_Assert(false, "Error - CTextureManager failed to load default texture %s", entry.szFileName);
-                AZ_Warning("[Shaders System]", false, "Error - CTextureManager failed to load default texture %s", entry.szFileName);
-            }
+            AZ_Assert(false, "Error - CTextureManager failed to load default texture %s", entry.szFileName);
+            AZ_Warning("[Shaders System]", false, "Error - CTextureManager failed to load default texture %s", entry.szFileName);
         }
     }
 

Code/CryEngine/RenderDll/RenderDll_precompiled.cpp

@@ -12,4 +12,4 @@
 // Original file Copyright Crytek GMBH or its affiliates, used under license.
 
 #include "RenderDll_precompiled.h"
- 
+

Code/CryEngine/RenderDll/XRenderD3D9/CRELensOpticsD3D.cpp

@@ -198,4 +198,4 @@ bool CRELensOptics::mfDraw(CShader* pShader, [[maybe_unused]] SShaderPass* pass)
 void CRELensOptics::ClearResources()
 {
     g_SoftOcclusionManager.ClearResources();
-}
+}

Code/CryEngine/RenderDll/XRenderD3D9/CryRenderGL.props

@@ -14,4 +14,4 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup />
-</Project>
+</Project>

Code/CryEngine/RenderDll/XRenderD3D9/CryRenderMETAL.props

@@ -14,4 +14,4 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup />
-</Project>
+</Project>

Code/CryEngine/RenderDll/XRenderD3D9/D3DHMDRenderer.h

@@ -116,4 +116,4 @@ class D3DHMDRenderer
         EyeRenderTarget m_eyes[STEREO_EYE_COUNT];     ///< Device render targets to be rendered to and submitted to the HMD for display.
 
         bool m_framePrepared;       ///< If true, PrepareFrame() and SubmitFrame() were called in the proper ordering (just for debugging purproses).
-};
+};

Code/CryEngine/RenderDll/XRenderD3D9/DX/RenderCapabilities.cpp

@@ -53,4 +53,4 @@ namespace RenderCapabilities
     {
         return true;
     }
-}
+}

Code/CryEngine/RenderDll/XRenderD3D9/DX12/RenderCapabilities.cpp

@@ -53,4 +53,4 @@ namespace RenderCapabilities
     {
         return true;
     }
-}
+}

Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/CCryDX12Asynchronous.cpp

@@ -11,4 +11,4 @@
 */
 
 // Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
+#include "RenderDll_precompiled.h"

Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/CCryDX12View.cpp

@@ -11,4 +11,4 @@
 */
 
 // Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
+#include "RenderDll_precompiled.h"

Code/CryEngine/RenderDll/XRenderD3D9/DX12/Resource/Texture/CCryDX12TextureBase.cpp

@@ -11,4 +11,4 @@
 */
 
 // Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
+#include "RenderDll_precompiled.h"

Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLADLoader.cpp

@@ -43,4 +43,4 @@
 #       include <glad/glx.h>
 #       undef GLAD_GLX_IMPLEMENTATION
 #   endif
-#endif
+#endif

Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLBlitShaders.hpp

@@ -40,4 +40,4 @@ namespace NCryOpenGL
                                                                 "{"
                                                                 "   Output0 = texture(text0, VtxOutput0.xy);"
                                                                 "}";
-}
+}

Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLFormat.hpp

@@ -352,4 +352,4 @@ namespace NCryOpenGL
 };
 
 
-#endif //__GLFORMAT__
+#endif //__GLFORMAT__

Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLInstrument.hpp

@@ -1112,4 +1112,4 @@ CUSTOM_INSTRUMENT(Delete, glDeleteSamplers)
 CUSTOM_INSTRUMENT(Delete, glDeleteTransformFeedbacks)
 CUSTOM_INSTRUMENT(Delete, glDeleteProgramPipelines)
 
-#endif //__GLINSTRUMENT__
+#endif //__GLINSTRUMENT__

Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBlendState.cpp

@@ -51,4 +51,4 @@ bool CCryDXGLBlendState::Apply(NCryOpenGL::CContext* pContext)
 void CCryDXGLBlendState::GetDesc(D3D11_BLEND_DESC* pDesc)
 {
     (*pDesc) = m_kDesc;
-}
+}

Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBlob.cpp

@@ -75,4 +75,4 @@ LPVOID CCryDXGLBlob::GetBufferPointer()
 SIZE_T CCryDXGLBlob::GetBufferSize()
 {
     return m_uBufferSize;
-}
+}

Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLBuffer.hpp

@@ -41,4 +41,4 @@ private:
     D3D11_BUFFER_DESC m_kDesc;
 };
 
-#endif //__CRYDXGLBUFFER__
+#endif //__CRYDXGLBUFFER__

Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDepthStencilState.cpp

@@ -50,4 +50,4 @@ bool CCryDXGLDepthStencilState::Apply(uint32 uStencilReference, NCryOpenGL::CCon
 void CCryDXGLDepthStencilState::GetDesc(D3D11_DEPTH_STENCIL_DESC* pDesc)
 {
     (*pDesc) = m_kDesc;
-}
+}

Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDepthStencilView.cpp

@@ -53,4 +53,4 @@ NCryOpenGL::SOutputMergerView* CCryDXGLDepthStencilView::GetGLView()
 void CCryDXGLDepthStencilView::GetDesc(D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc)
 {
     *pDesc = m_kDesc;
-}
+}

Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLDepthStencilView.hpp

@@ -44,4 +44,4 @@ protected:
     _smart_ptr<NCryOpenGL::SOutputMergerView> m_spGLView;
 };
 
-#endif //__CRYDXGLDEPTHSTENCILVIEW__
+#endif //__CRYDXGLDEPTHSTENCILVIEW__

Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIObject.cpp

@@ -53,4 +53,4 @@ HRESULT CCryDXGLGIObject::GetParent(REFIID riid, void** ppParent)
     DXGL_TODO("Implement if required")
     * ppParent = NULL;
     return E_FAIL;
-}
+}

Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIOutput.cpp

@@ -331,4 +331,4 @@ HRESULT CCryDXGLGIOutput::GetFrameStatistics(DXGI_FRAME_STATISTICS* pStats)
 {
     DXGL_NOT_IMPLEMENTED
     return E_FAIL;
-}
+}

Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLGIOutput.hpp

@@ -57,4 +57,4 @@ protected:
     DXGI_OUTPUT_DESC m_kDesc;
 };
 
-#endif //__CRYDXGLGIOUTPUT__
+#endif //__CRYDXGLGIOUTPUT__

Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Interfaces/CCryDXGLInputLayout.cpp

@@ -34,4 +34,4 @@ CCryDXGLInputLayout::~CCryDXGLInputLayout()
 NCryOpenGL::SInputLayout* CCryDXGLInputLayout::GetGLLayout()
 {
     return m_spGLLayout;
-}
+}