Merge branch 'master' into NDK-ShadowMapping

Former-commit-id: e2be28b65207dfbb81efe58f31ca31548afecee7

src/Nazara/Graphics/Graphics.cpp

@@ -19,6 +19,7 @@
 #include <Nazara/Graphics/RenderTechniques.hpp>
 #include <Nazara/Graphics/SkinningManager.hpp>
 #include <Nazara/Graphics/SkyboxBackground.hpp>
+#include <Nazara/Graphics/Sprite.hpp>
 #include <Nazara/Graphics/Formats/MeshLoader.hpp>
 #include <Nazara/Graphics/Formats/OBJLoader.hpp>
 #include <Nazara/Graphics/Formats/TextureLoader.hpp>
@@ -90,6 +91,12 @@ namespace Nz
 			return false;
 		}
 
+		if (!Sprite::Initialize())
+		{
+			NazaraError("Failed to initialize sprites");
+			return false;
+		}
+
 		// Loaders
 		Loaders::RegisterOBJ();
 
@@ -189,6 +196,7 @@ namespace Nz
 		ParticleController::Uninitialize();
 		Material::Uninitialize();
 		SkyboxBackground::Uninitialize();
+		Sprite::Uninitialize();
 
 		NazaraNotice("Uninitialized: Graphics module");