X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture1d.cpp;h=e746409b8101dfca984017761e5a46998927edf8;hp=a1ee418b22381a27916c407a6d8050459c02ddb0;hb=ef9ffbc287417520d223ce29dc6c2de110cac945;hpb=03d3984ecd2c4e7c38b6a62b4b7a81bab69f8d40

diff --git a/source/texture1d.cpp b/source/texture1d.cpp
index a1ee418b..e746409b 100644
--- a/source/texture1d.cpp
+++ b/source/texture1d.cpp
@@ -108,7 +108,7 @@ void Texture1D::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, l);
 	}
 	else if(w!=width)
@@ -160,8 +160,6 @@ void Texture1D::Loader::raw_data(const string &data)
 
 void Texture1D::Loader::storage(PixelFormat fmt, unsigned w)
 {
-	if(srgb)
-		fmt = get_srgb_pixelformat(fmt);
 	obj.storage(fmt, w);
 }