summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKahrl <kahrl@gmx.net>2013-09-04 00:16:33 +0200
committerKahrl <kahrl@gmx.net>2013-09-04 00:16:33 +0200
commitaf490330e7f76ba1916c99d90c705a09f68ac00a (patch)
treea9858226e2180fef5c491af1d48ec2a27677b632
parent1ad9365d34bbc4af1b712c77692fd027ebd4b586 (diff)
downloadminetest-af490330e7f76ba1916c99d90c705a09f68ac00a.tar.gz
minetest-af490330e7f76ba1916c99d90c705a09f68ac00a.tar.bz2
minetest-af490330e7f76ba1916c99d90c705a09f68ac00a.zip
Fix remnants of s32 enable_shaders
-rw-r--r--minetest.conf.example6
-rw-r--r--src/mapblock_mesh.cpp2
2 files changed, 3 insertions, 5 deletions
diff --git a/minetest.conf.example b/minetest.conf.example
index aeeff8223..929f39aa4 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -166,10 +166,8 @@
#trilinear_filter = false
# Set to true to pre-generate all item visuals
#preload_item_visuals = true
-# 0: disable shaders
-# (1: low level shaders; not implemented)
-# 2: enable high level shaders
-#enable_shaders = 2
+# Set to true to enable shaders. Disable them if video_driver = direct3d9/8.
+#enable_shaders = true
# Set to true to enable textures bumpmapping. Requires shaders enabled.
#enable_bumpmapping = false
# The time in seconds it takes between repeated
diff --git a/src/mapblock_mesh.cpp b/src/mapblock_mesh.cpp
index b70b25eab..6cbc2c521 100644
--- a/src/mapblock_mesh.cpp
+++ b/src/mapblock_mesh.cpp
@@ -1294,7 +1294,7 @@ MapBlockMesh::~MapBlockMesh()
bool MapBlockMesh::animate(bool faraway, float time, int crack, u32 daynight_ratio)
{
- bool enable_shaders = (g_settings->getS32("enable_shaders") > 0);
+ bool enable_shaders = g_settings->getBool("enable_shaders");
bool enable_bumpmapping = g_settings->getBool("enable_bumpmapping");
if(!m_has_animation)