From: Perttu Ahola <celeron55@gmail.com>
Date: Sat, 1 Dec 2012 22:14:27 +0000 (+0200)
Subject: Add enable_shaders to minetest.conf.example
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=98fd36467293cfcde1680b1146961b0b6d4ed667;p=zefram%2Fminetest%2Fminetest_engine.git

Add enable_shaders to minetest.conf.example
---

diff --git a/minetest.conf.example b/minetest.conf.example
index 6f023094..3ca794cc 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -136,6 +136,10 @@
 #trilinear_filter = false
 # Set to true to pre-generate all item visuals
 #preload_item_visuals = false
+# 0: disable shaders
+# (1: low level shaders; not implemented)
+# 2: enable high level shaders
+#enable_shaders = 2
 
 #
 # Server stuff
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 3145a90e..86aa87b2 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -104,7 +104,6 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("view_bobbing_amount", "1.0");
 	settings->setDefault("enable_3d_clouds", "true");
 	settings->setDefault("opaque_water", "false");
-	settings->setDefault("enable_shaders", "2");
 	settings->setDefault("console_color", "(0,0,0)");
 	settings->setDefault("console_alpha", "200");
 	settings->setDefault("enable_sound", "true");
@@ -116,6 +115,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("bilinear_filter", "false");
 	settings->setDefault("trilinear_filter", "false");
 	settings->setDefault("preload_item_visuals", "false");
+	settings->setDefault("enable_shaders", "2");
 
 	// Server stuff
 	// "map-dir" doesn't exist by default.