From 70bf18182dd42de9f328e04032ad06534028baf8 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Fri, 15 Dec 2017 22:18:19 -0400 Subject: [PATCH] Fix Image:getMipmapCount returning greater than 1 when a compressed texture is loaded without mipmaps in its source data but with mipmaps=true set. --- src/modules/graphics/Image.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/modules/graphics/Image.cpp b/src/modules/graphics/Image.cpp index 7655ba8a5..3c3772d2e 100644 --- a/src/modules/graphics/Image.cpp +++ b/src/modules/graphics/Image.cpp @@ -86,13 +86,14 @@ void Image::init(PixelFormat fmt, int w, int h, const Settings &settings) width = (int) (pixelWidth / settings.dpiScale + 0.5); height = (int) (pixelHeight / settings.dpiScale + 0.5); - mipmapCount = mipmapsType == MIPMAPS_NONE ? 1 : getMipmapCount(w, h); format = fmt; if (isCompressed() && mipmapsType == MIPMAPS_GENERATED) mipmapsType = MIPMAPS_NONE; - if (getMipmapCount() > 1) + mipmapCount = mipmapsType == MIPMAPS_NONE ? 1 : getMipmapCount(w, h); + + if (mipmapCount > 1) filter.mipmap = defaultMipmapFilter; initQuad();