Merge branch 'master' into graphics-next

2021-05-17 18:58:04 +02:00
parent b0b1acf497 3d8a399817
commit 26de5872eb
15 changed files with 348 additions and 188 deletions
--- a/src/Nazara/Platform/SDL2/CursorImpl.cpp
+++ b/src/Nazara/Platform/SDL2/CursorImpl.cpp
@@ -24,9 +24,9 @@ namespace Nz
 			m_iconImage.GetWidth(),
 			m_iconImage.GetHeight(),
 			32,
-			32 * m_iconImage.GetWidth(),
-			SDL_PIXELFORMAT_BGRA8888
-			);
+			4 * m_iconImage.GetWidth(),
+			SDL_PIXELFORMAT_BGRA32
+		);

 		if (!m_icon)
 		{