From 9852c299d56bdf0fa57cc41e7c3d2125031ac095 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 6 Apr 2009 11:22:31 +0000
Subject: [PATCH] Added check against null colour layer to prevent a crash when
 a null colour layer is assigned

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

diff --git a/src/osgTerrain/GeometryTechnique.cpp b/src/osgTerrain/GeometryTechnique.cpp
index 229f53d74..06d85eda1 100644
--- a/src/osgTerrain/GeometryTechnique.cpp
+++ b/src/osgTerrain/GeometryTechnique.cpp
@@ -725,7 +725,7 @@ void GeometryTechnique::applyColorLayers()
             {
                 continue;
             }
-            
+
             colorLayer = switchLayer->getLayer(switchLayer->getActiveLayer());
             if (!colorLayer) continue;
         }
@@ -795,7 +795,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();