Modified Files:

	simgear/scene/material/mat.cxx: Put solid scenery into the
	opaque render bin

diff --git a/simgear/scene/material/mat.cxx b/simgear/scene/material/mat.cxx
index e73ba37c6fafba7a06fe26f886074d9b1bc5d97a..cf5266d83aafa041c7647ef6ceddd0b5531ec363 100644 (file)
--- a/simgear/scene/material/mat.cxx
+++ b/simgear/scene/material/mat.cxx
@@ -268,11 +268,12 @@ SGMaterial::build_state( bool defer_tex_load )
         // Set up the textured state
         osg::ShadeModel* shadeModel = new osg::ShadeModel;
         shadeModel->setMode(osg::ShadeModel::SMOOTH);
-        stateSet->setAttributeAndModes(shadeModel, osg::StateAttribute::ON);
+        stateSet->setAttribute(shadeModel);
 
         osg::CullFace* cullFace = new osg::CullFace;
         cullFace->setMode(osg::CullFace::BACK);
-        stateSet->setAttributeAndModes(cullFace, osg::StateAttribute::ON);
+        stateSet->setMode(GL_CULL_FACE, osg::StateAttribute::ON);
+        stateSet->setAttribute(cullFace);
 
         stateSet->setMode(GL_LIGHTING, osg::StateAttribute::ON);
 
@@ -295,9 +296,11 @@ SGMaterial::build_state( bool defer_tex_load )
 
         if (ambient[3] < 1 || diffuse[3] < 1 ||
             specular[3] < 1 || emission[3] < 1) {
+          stateSet->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
           stateSet->setMode(GL_BLEND, osg::StateAttribute::ON);
           stateSet->setMode(GL_ALPHA_TEST, osg::StateAttribute::ON);
         } else {
+          stateSet->setRenderingHint(osg::StateSet::OPAQUE_BIN);
           stateSet->setMode(GL_BLEND, osg::StateAttribute::OFF);
           stateSet->setMode(GL_ALPHA_TEST, osg::StateAttribute::OFF);
         }