From 0b3284072da8e0805a389d1826c52966d4cfcf5e Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 7 Sep 2009 10:50:48 +0000
Subject: [PATCH] Added check for null masterLocator

---
 src/osgVolume/RayTracedTechnique.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/osgVolume/RayTracedTechnique.cpp b/src/osgVolume/RayTracedTechnique.cpp
index af90caecf..7c5f37168 100644
--- a/src/osgVolume/RayTracedTechnique.cpp
+++ b/src/osgVolume/RayTracedTechnique.cpp
@@ -446,11 +446,14 @@ void RayTracedTechnique::init()
         texgen->setMode(osg::TexGen::OBJECT_LINEAR);
         texgen->setPlanesFromMatrix( geometryMatrix * osg::Matrix::inverse(imageMatrix));
 
-        osg::ref_ptr<TexGenLocatorCallback> locatorCallback = new TexGenLocatorCallback(texgen, masterLocator, layerLocator);
-        masterLocator->addCallback(locatorCallback.get());
-        if (masterLocator != layerLocator)
+        if (masterLocator)
         {
-            if (layerLocator) layerLocator->addCallback(locatorCallback.get());
+            osg::ref_ptr<TexGenLocatorCallback> locatorCallback = new TexGenLocatorCallback(texgen, masterLocator, layerLocator);
+            masterLocator->addCallback(locatorCallback.get());
+            if (masterLocator != layerLocator)
+            {
+                if (layerLocator) layerLocator->addCallback(locatorCallback.get());
+            }
         }
 
         stateset->setTextureAttributeAndModes(0, texgen, osg::StateAttribute::ON);