X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexturecube.cpp;h=c56094c9cb0bd36e837db1df0c1c115fc38ad876;hp=a2c6c8eb62725c21ce21553cf30926b01fe127e8;hb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;hpb=7b569bbfcfb65d8d88b47ac42ee1df6a7d27e784

diff --git a/source/core/texturecube.cpp b/source/core/texturecube.cpp
index a2c6c8eb..c56094c9 100644
--- a/source/core/texturecube.cpp
+++ b/source/core/texturecube.cpp
@@ -127,14 +127,7 @@ void TextureCube::image(TextureCubeFace face, unsigned level, const void *data)
 	{
 		allocated |= 1<<get_face_index(face);
 		if((allocated&63)==63)
-		{
 			allocated |= 64;
-			if(auto_gen_mipmap && level==0 && (allocated&63)==63)
-			{
-				generate_mipmap();
-				allocated |= (64<<levels)-1;
-			}
-		}
 	}
 	else if(!(allocated&(64<<level)))
 	{
@@ -171,9 +164,6 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
 		bind_scratch();
 		glTexSubImage2D(face, level, x, y, wd, ht, comp, type, data);
 	}
-
-	if(auto_gen_mipmap && level==0)
-		generate_mipmap();
 }
 
 void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)
@@ -280,7 +270,7 @@ Vector3 TextureCube::get_texel_direction(TextureCubeFace face, unsigned u, unsig
 	return fv+s*sv+t*tv;
 }
 
-UInt64 TextureCube::get_data_size() const
+uint64_t TextureCube::get_data_size() const
 {
 	return id ? size*size*6*get_pixel_size(storage_fmt) : 0;
 }