X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture3d.cpp;h=7c4b04469d23a0b17961543cf34ff9e21688977a;hp=36fdfa0f3b8f6b591fd19b7f4d4047fa45c0ba06;hb=6a832fe1771f8c7bca0faa0d383fbbab062a1c56;hpb=03d3984ecd2c4e7c38b6a62b4b7a81bab69f8d40

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 36fdfa0f..7c4b0446 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -188,7 +188,7 @@ void Texture3D::image(const Graphics::Image &img, bool srgb)
 	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
 	if(width==0)
 	{
-		unsigned l = (is_mipmapped(min_filter) ? 0 : 1);
+		unsigned l = (is_mipmapped(min_filter) ? mipmap_levels ? mipmap_levels : 0 : 1);
 		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, d, l);
 	}
 	else if(w!=width || h!=height || d!=depth)
@@ -256,8 +256,6 @@ void Texture3D::Loader::raw_data(const string &data)
 
 void Texture3D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h, unsigned d)
 {
-	if(srgb)
-		fmt = get_srgb_pixelformat(fmt);
 	obj.storage(fmt, w, h, d);
 }