From: you <ovvv@web.de>
Date: Fri, 19 May 2017 06:08:12 +0000 (+0200)
Subject: Do not create dummy normalmaps (#4180)
X-Git-Tag: 0.4.16~103
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=35267406aa849195b72bf2edf63fecb16be013bc;p=oweals%2Fminetest.git

Do not create dummy normalmaps (#4180)

fixes #1811
---

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