From 0cfe3a810aee9311e8df811b28ae86948f924ae0 Mon Sep 17 00:00:00 2001 From: Lars Hofhansl Date: Sat, 4 Nov 2017 18:05:47 -0700 Subject: Do not scale texture unless necessary. This avoids scaling textures to 'texture_min_size' unless it is actually required (because either auto-scaling or bi/trilinear filtering is enabled) --- src/client/tile.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/tile.cpp b/src/client/tile.cpp index 99495132b..cfdff1bb2 100644 --- a/src/client/tile.cpp +++ b/src/client/tile.cpp @@ -1805,7 +1805,8 @@ bool TextureSource::generateImagePart(std::string part_of_name, * mix high- and low-res textures, or for mods with least-common-denominator * textures that don't have the resources to offer high-res alternatives. */ - s32 scaleto = g_settings->getS32("texture_min_size"); + const bool filter = m_setting_trilinear_filter || m_setting_bilinear_filter; + const s32 scaleto = filter ? g_settings->getS32("texture_min_size") : 1; if (scaleto > 1) { const core::dimension2d dim = baseimg->getDimension(); -- cgit v1.2.3