From: Dániel Juhász <juhdanad@gmail.com>
Date: Wed, 12 Apr 2017 23:24:00 +0000 (+0200)
Subject: Only use palette if param_type2 is correct
X-Git-Tag: 0.4.16~251
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6f641df8a52ccb84452a289416527e3d1a36621a;p=oweals%2Fminetest.git

Only use palette if param_type2 is correct
---

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index 558acafd6..ce3e378a0 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -786,7 +786,10 @@ void ContentFeatures::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc
 			tiledef_special[j].backface_culling, material_type);
 	}
 
-	palette = tsrc->getPalette(palette_name);
+	if (param_type_2 == CPT2_COLOR ||
+			param_type_2 == CPT2_COLORED_FACEDIR ||
+			param_type_2 == CPT2_COLORED_WALLMOUNTED)
+		palette = tsrc->getPalette(palette_name);
 
 	if ((drawtype == NDT_MESH) && (mesh != "")) {
 		// Meshnode drawtype