diff options
Diffstat (limited to 'src/client/tile.cpp')
| -rw-r--r-- | src/client/tile.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/client/tile.cpp b/src/client/tile.cpp index f0f1800b0..cfdff1bb2 100644 --- a/src/client/tile.cpp +++ b/src/client/tile.cpp @@ -1208,17 +1208,17 @@ bool TextureSource::generateImagePart(std::string part_of_name, #endif if (image == NULL) { if (part_of_name != "") { - if (part_of_name.find("_normal.png") == std::string::npos){ - errorstream<<"generateImage(): Could not load image \"" - <<part_of_name<<"\""<<" while building texture"<<std::endl; - errorstream<<"generateImage(): Creating a dummy" - <<" image for \""<<part_of_name<<"\""<<std::endl; - } else { - infostream<<"generateImage(): Could not load normal map \"" - <<part_of_name<<"\""<<std::endl; - infostream<<"generateImage(): Creating a dummy" - <<" normal map for \""<<part_of_name<<"\""<<std::endl; + + // Do not create normalmap dummies + if (part_of_name.find("_normal.png") != std::string::npos) { + warningstream << "generateImage(): Could not load normal map \"" + << part_of_name << "\"" << std::endl; + return true; } + + errorstream << "generateImage(): Could not load image \"" + << part_of_name << "\" while building texture; " + "Creating a dummy image" << std::endl; } // Just create a dummy image @@ -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<u32> dim = baseimg->getDimension(); |