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

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

Browse Source
This commit is contained in:
Robert Osfield
2009-04-06 11:27:28 +00:00
parent 2bb480759f
commit 171bc9da21
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgTerrain/GeometryTechnique.cpp
View File

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