Do not create dummy normalmaps (#4180)

fixes #1811
This commit is contained in:
you 2017-05-19 08:08:12 +02:00 committed by Loïc Blot
parent a4a377ecad
commit 35267406aa
1 changed files with 10 additions and 10 deletions

View File

@ -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