From e6ab3ddb7d263d340c03a826feb2de1a1c75e47a Mon Sep 17 00:00:00 2001
From: Frederic Bouvier <fredfgfs01@free.fr>
Date: Sat, 14 Jul 2012 13:00:05 +0200
Subject: [PATCH] More node mask fix

---
 simgear/environment/precipitation.cxx | 2 +-
 simgear/scene/model/particles.cxx     | 1 +
 simgear/scene/sky/newcloud.cxx        | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/simgear/environment/precipitation.cxx b/simgear/environment/precipitation.cxx
index 3f57afc7..073c06d8 100644
--- a/simgear/environment/precipitation.cxx
+++ b/simgear/environment/precipitation.cxx
@@ -80,7 +80,7 @@ osg::Group* SGPrecipitation::build(void)
         group->addChild(_precipitationEffect.get());
     }
 
-    group->setNodeMask( ~simgear::CASTSHADOW_BIT );
+    group->setNodeMask( ~(simgear::CASTSHADOW_BIT | simgear::MODELLIGHT_BIT) );
 
     return group;
 }
diff --git a/simgear/scene/model/particles.cxx b/simgear/scene/model/particles.cxx
index d461e08e..5401e8ec 100644
--- a/simgear/scene/model/particles.cxx
+++ b/simgear/scene/model/particles.cxx
@@ -114,6 +114,7 @@ osg::Group* Particles::getCommonRoot()
         commonGeode.get()->setName("common particle system geode");
         commonRoot.get()->addChild(commonGeode.get());
         commonRoot.get()->addChild(psu.get());
+        commonRoot->setNodeMask( ~simgear::MODELLIGHT_BIT );
     }
     return commonRoot.get();
 }
diff --git a/simgear/scene/sky/newcloud.cxx b/simgear/scene/sky/newcloud.cxx
index 2f24298c..4632347e 100644
--- a/simgear/scene/sky/newcloud.cxx
+++ b/simgear/scene/sky/newcloud.cxx
@@ -47,6 +47,7 @@
 #include <simgear/scene/util/SGReaderWriterOptions.hxx>
 #include <simgear/scene/util/StateAttributeFactory.hxx>
 #include <simgear/scene/util/SGUpdateVisitor.hxx>
+#include <simgear/scene/util/RenderConstants.hxx>
 
 #include <algorithm>
 #include <osg/BlendFunc>
@@ -248,6 +249,7 @@ osg::ref_ptr<EffectGeode> SGNewCloud::genCloud() {
     geode->addDrawable(sg);
     geode->setName("3D cloud");
     geode->setEffect(effect.get());
+    geode->setNodeMask( ~simgear::MODELLIGHT_BIT );
     
     return geode;
 }
-- 
2.39.5