Merge branch 'master' into SDL2

2020-05-27 11:11:21 +02:00
parent 96ea792656 ca2425f310
commit 1425f99edf
211 changed files with 7628 additions and 2883 deletions
--- a/include/Nazara/Renderer/Texture.hpp
+++ b/include/Nazara/Renderer/Texture.hpp
@@ -38,7 +38,6 @@ namespace Nz
 		public:
 			Texture() = default;
 			Texture(ImageType type, PixelFormatType format, unsigned int width, unsigned int height, unsigned int depth = 1, UInt8 levelCount = 1);
-			explicit Texture(const Image* image);
 			Texture(const Texture&) = delete;
 			Texture(Texture&&) = delete;
 			~Texture();