Melchior:

Don't overwrite user settings from config files.

fgfs had in any case set bump-mapping to false, no matter if this
node did already exist (because it was defined in a config file).

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 1d5ec766d7c903026b3836439795b9be943066c6..a425fe67f957e5bd3f5d61695bd3b7dff54de528 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -1610,8 +1610,7 @@ bool fgInitSubsystems() {
     //////////////////////////////////////////////////////////////////////
     // Initialize the 2D cloud subsystem.
     ////////////////////////////////////////////////////////////////////
-    fgGetNode("/sim/rendering/bump-mapping", true);
-    fgSetBool("/sim/rendering/bump-mapping", false);
+    fgGetBool("/sim/rendering/bump-mapping", false);
 
 #ifdef FG_USE_CLOUDS_3D
     ////////////////////////////////////////////////////////////////////

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 276892f3201cf5013648fd75f6df6d9bebd76341..58c47e0e914e57af5823fb1f7b0f6f3319e43457 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -216,7 +216,7 @@ static void fgMainLoop( void ) {
     // static const SGPropertyNode *replay_master
     //     = fgGetNode("/sim/freeze/replay", true);
 
-    SGCloudLayer::enable_bump_mapping = fgGetBool("/sim/rendering/bump-mapping",true);
+    SGCloudLayer::enable_bump_mapping = fgGetBool("/sim/rendering/bump-mapping");
 
     // Update the elapsed time.
     static bool first_time = true;