Index: trunk/src/gl/gl_device.cc
===================================================================
--- trunk/src/gl/gl_device.cc	(revision 493)
+++ trunk/src/gl/gl_device.cc	(revision 498)
@@ -109,9 +109,9 @@
 
 	// Detect if mipmapping was requested
-	if ( gl_type == GL_TEXTURE_2D && gl_enum != GL_RED_INTEGER && asampler.filter_min != sampler::LINEAR && asampler.filter_min != sampler::NEAREST )
-	{
-		// TODO: This should not be done if we use framebuffers!
-		glTexParameteri( gl_type, GL_GENERATE_MIPMAP, GL_TRUE);
-	}
+// 	if ( gl_type == GL_TEXTURE_2D && gl_enum != GL_RED_INTEGER && asampler.filter_min != sampler::LINEAR && asampler.filter_min != sampler::NEAREST )
+// 	{
+// 		// TODO: This should not be done if we use framebuffers!
+// 		glTexParameteri( gl_type, GL_GENERATE_MIPMAP, GL_TRUE);
+// 	}
 
 	if ( asampler.filter_max != sampler::NEAREST )
@@ -154,4 +154,11 @@
 	else
 		glTexImage2DMultisample( gl_type, 4, gl_internal, size.x, size.y, 1 );
+
+	if ( gl_type == GL_TEXTURE_2D && gl_enum != GL_RED_INTEGER && asampler.filter_min != sampler::LINEAR && asampler.filter_min != sampler::NEAREST )
+	{
+		// TODO: This should not be done if we use framebuffers!
+		glGenerateMipmap( gl_type );
+	}
+
 
 	glBindTexture( gl_type, 0 );