From 96e24a3e8d0c8ca8590e57678e6ef7319ad66725 Mon Sep 17 00:00:00 2001 From: ehofman Date: Wed, 20 Oct 2004 08:18:29 +0000 Subject: [PATCH] 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). --- src/Main/fg_init.cxx | 3 +-- src/Main/main.cxx | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx index 1d5ec766d..a425fe67f 100644 --- 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 276892f32..58c47e0e9 100644 --- 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;