FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added check for null masterLocator

Browse Source
This commit is contained in:
Robert Osfield
2009-09-07 10:50:48 +00:00
parent b9e4313029
commit 0b3284072d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgVolume/RayTracedTechnique.cpp
View File

@@ -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);