Merge branch 'merge-requests/1555' into next

[flightgear.git] / src / Environment / environment_mgr.cxx

diff --git a/src/Environment/environment_mgr.cxx b/src/Environment/environment_mgr.cxx
index 18015d6cf9264e1000e79676824ddb4f5c717a19..312d52129937aa98a8021080d6634960e4a7b4c3 100644 (file)
--- a/src/Environment/environment_mgr.cxx
+++ b/src/Environment/environment_mgr.cxx
@@ -55,16 +55,12 @@ public:
 
 private:
   FGClouds * _fgClouds;
-  SGPropertyNode_ptr _shaderNode;
   SGPropertyNode_ptr _enableNode;
 };
 
 FG3DCloudsListener::FG3DCloudsListener( FGClouds * fgClouds ) :
     _fgClouds( fgClouds ) 
 {
-  _shaderNode = fgGetNode( "/sim/rendering/shader-effects", true );
-  _shaderNode->addChangeListener( this );
-
   _enableNode = fgGetNode( "/sim/rendering/clouds3d-enable", true );
   _enableNode->addChangeListener( this );
 
@@ -74,12 +70,11 @@ FG3DCloudsListener::FG3DCloudsListener( FGClouds * fgClouds ) :
 FG3DCloudsListener::~FG3DCloudsListener()
 {
   _enableNode->removeChangeListener( this );
-  _shaderNode->removeChangeListener( this );
 }
 
 void FG3DCloudsListener::valueChanged( SGPropertyNode * node )
 {
-  _fgClouds->set_3dClouds( _enableNode->getBoolValue() && _shaderNode->getBoolValue() );
+  _fgClouds->set_3dClouds( _enableNode->getBoolValue() );
 }
 
 FGEnvironmentMgr::FGEnvironmentMgr () :