From 171bc9da21c9d8ba3988fb124ac9d1a672d1999c Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 6 Apr 2009 11:27:28 +0000
Subject: [PATCH] Merged from svn/trunk disabling of use of display lists and a
 extra check against NULL to prevent a crash when NULL colour layers are
 assigned

---
 src/osgTerrain/GeometryTechnique.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/osgTerrain/GeometryTechnique.cpp b/src/osgTerrain/GeometryTechnique.cpp
index 5d1953955..25a733aac 100644
--- a/src/osgTerrain/GeometryTechnique.cpp
+++ b/src/osgTerrain/GeometryTechnique.cpp
@@ -664,7 +664,7 @@ void GeometryTechnique::generateGeometry(Locator* masterLocator, const osg::Vec3
     }
 
 
-    //geometry->setUseDisplayList(false);
+    geometry->setUseDisplayList(false);
     geometry->setUseVertexBufferObjects(true);
     
     
@@ -702,7 +702,7 @@ void GeometryTechnique::applyColorLayers()
             {
                 continue;
             }
-            
+
             colorLayer = switchLayer->getLayer(switchLayer->getActiveLayer());
             if (!colorLayer) continue;
         }
@@ -772,7 +772,7 @@ void GeometryTechnique::applyTransparency()
     bool containsTransparency = false;
     for(unsigned int i=0; i<_terrainTile->getNumColorLayers(); ++i)
     {
-        osg::Image* image = _terrainTile->getColorLayer(i)->getImage();
+        osg::Image* image = (_terrainTile->getColorLayer(i)!=0) ? _terrainTile->getColorLayer(i)->getImage() : 0;
         if (image)
         {
             containsTransparency = image->isImageTranslucent();