Browse Source

Fix the default mipmap filter of mipmapped Canvases (thanks Shell32).

--HG--
branch : minor
Alex Szpakowski 8 years ago
parent
commit
353852ca24
2 changed files with 6 additions and 2 deletions
  1. 5 1
      src/modules/graphics/Canvas.cpp
  2. 1 1
      src/modules/graphics/Graphics.h

+ 5 - 1
src/modules/graphics/Canvas.cpp

@@ -65,7 +65,11 @@ Canvas::Canvas(const Settings &settings)
 	if ((!readable || settings.msaa > 1) && settings.mipmaps != MIPMAPS_NONE)
 		throw love::Exception("Non-readable and MSAA textures cannot have mipmaps.");
 
-	mipmapCount = settings.mipmaps == MIPMAPS_NONE ? 1 : getMipmapCount(pixelWidth, pixelHeight);
+	if (settings.mipmaps != MIPMAPS_NONE)
+	{
+		mipmapCount = getMipmapCount(pixelWidth, pixelHeight);
+		filter.mipmap = defaultMipmapFilter;
+	}
 
 	canvasCount++;
 }

+ 1 - 1
src/modules/graphics/Graphics.h

@@ -822,7 +822,7 @@ protected:
 
 		Texture::Filter defaultFilter = Texture::Filter();
 
-		Texture::FilterMode defaultMipmapFilter = Texture::FILTER_NEAREST;
+		Texture::FilterMode defaultMipmapFilter = Texture::FILTER_LINEAR;
 		float defaultMipmapSharpness = 0.0f;
 	};