fly/flightgear
1
0
Fork 0
Code Activity

Use that static material function instead of the member one.

Browse source 
Modified Files:
 	src/FDM/groundcache.cxx src/Scenery/scenery.cxx
This commit is contained in:
frohlich 2009-02-27 19:31:33 +00:00 committed by Tim Moore
parent 4a683bed1e
commit fc35624a4f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/FDM/groundcache.cxx
View file

@ -201,7 +201,7 @@ void FGGroundCache::getGroundProperty(Drawable* drawable,
gp.material = 0;
backfaceCulling = false;
// XXX state set might be higher up in scene graph
gp.material = globals->get_matlib()->findMaterial(drawable->getStateSet());
gp.material = SGMaterialLib::findMaterial(drawable->getStateSet());
if (gp.material)
gp.type = (gp.material->get_solid() ? FGInterface::Solid
: FGInterface::Water);

2
src/Scenery/scenery.cxx
View file

@ -164,7 +164,7 @@ FGScenery::get_elevation_m(const SGGeod& geod, double& alt,
alt = elevation;
if (material) {
const osg::StateSet* stateSet = hit.getDrawable()->getStateSet();
*material = globals->get_matlib()->findMaterial(stateSet);
*material = SGMaterialLib::findMaterial(stateSet);
}
}
}