Only use palette if param_type2 is correct
authorDániel Juhász <juhdanad@gmail.com>
Wed, 12 Apr 2017 23:24:00 +0000 (01:24 +0200)
committerAuke Kok <sofar+github@foo-projects.org>
Thu, 13 Apr 2017 16:52:48 +0000 (09:52 -0700)
src/nodedef.cpp

index 558acafd6dbd093491e2ae71078754f6464108a6..ce3e378a08624e4156951a3fecb9dcb959455039 100644 (file)
@@ -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