diff options
| author | you <ovvv@web.de> | 2017-05-19 08:08:12 +0200 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-05-19 08:08:12 +0200 |
| commit | 35267406aa849195b72bf2edf63fecb16be013bc (patch) | |
| tree | 08f8322a20fd7f98b57772cf3f35359401fa9ad3 /src | |
| parent | a4a377ecad6f1732cc54e7ac329fdef9949f9bf7 (diff) | |
| download | minetest-35267406aa849195b72bf2edf63fecb16be013bc.tar.gz minetest-35267406aa849195b72bf2edf63fecb16be013bc.tar.bz2 minetest-35267406aa849195b72bf2edf63fecb16be013bc.zip | |
Do not create dummy normalmaps (#4180)
fixes #1811
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/tile.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/client/tile.cpp b/src/client/tile.cpp index f0f1800b0..99495132b 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 |