From: Kahrl <kahrl@gmx.net>
Date: Wed, 26 Nov 2014 18:54:04 +0000 (+0100)
Subject: Wield: always obey anisotropic_filter setting, not just for hi res textures
X-Git-Tag: 0.4.11~131
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=264d740c9de7834d8a5bcdc2c1ee3df828d9cdaa;p=oweals%2Fminetest.git

Wield: always obey anisotropic_filter setting, not just for hi res textures
---

diff --git a/src/wieldmesh.cpp b/src/wieldmesh.cpp
index 71193da76..66793249a 100644
--- a/src/wieldmesh.cpp
+++ b/src/wieldmesh.cpp
@@ -279,16 +279,15 @@ void WieldMeshSceneNode::setExtruded(const std::string &imagename,
 	material.setTexture(0, texture);
 	material.MaterialType = m_material_type;
 	material.setFlag(video::EMF_BACK_FACE_CULLING, true);
-	// Enable filtering only for high resolution texures
+	// Enable bi/trilinear filtering only for high resolution textures
 	if (dim.Width > 32) {
-		material.setFlag(video::EMF_ANISOTROPIC_FILTER, m_anisotropic_filter);
 		material.setFlag(video::EMF_BILINEAR_FILTER, m_bilinear_filter);
 		material.setFlag(video::EMF_TRILINEAR_FILTER, m_trilinear_filter);
 	} else {
-		material.setFlag(video::EMF_ANISOTROPIC_FILTER, false);
 		material.setFlag(video::EMF_BILINEAR_FILTER, false);
 		material.setFlag(video::EMF_TRILINEAR_FILTER, false);
 	}
+	material.setFlag(video::EMF_ANISOTROPIC_FILTER, m_anisotropic_filter);
 	// mipmaps cause "thin black line" artifacts
 #if (IRRLICHT_VERSION_MAJOR >= 1 && IRRLICHT_VERSION_MINOR >= 8) || IRRLICHT_VERSION_MAJOR >= 2
 	material.setFlag(video::EMF_USE_MIP_MAPS, false);