From 353852ca241345130977eb3ea39b11cefe12a87d Mon Sep 17 00:00:00 2001
From: Alex Szpakowski <slime73@gmail.com>
Date: Fri, 28 Apr 2017 21:36:50 -0300
Subject: [PATCH] Fix the default mipmap filter of mipmapped Canvases (thanks
 Shell32).

--HG--
branch : minor
---
 src/modules/graphics/Canvas.cpp | 6 +++++-
 src/modules/graphics/Graphics.h | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/modules/graphics/Canvas.cpp b/src/modules/graphics/Canvas.cpp
index 7ec5d68ed..96f59594a 100644
--- a/src/modules/graphics/Canvas.cpp
+++ b/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++;
 }
diff --git a/src/modules/graphics/Graphics.h b/src/modules/graphics/Graphics.h
index bda42a09c..77c008c0d 100644
--- a/src/modules/graphics/Graphics.h
+++ b/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;
 	};