Merge remote-tracking branch 'upstream/main' into DisableAtomShim

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;
-};
+};