Use that static material function instead of the member one.

Modified Files:
 	src/FDM/groundcache.cxx src/Scenery/scenery.cxx

diff --git a/src/FDM/groundcache.cxx b/src/FDM/groundcache.cxx
index fd18930650262da9d1b6684f3f6a54dbb7cce757..90e79b8643b21cbd3d70ac0d196765e26c818667 100644 (file)
--- a/src/FDM/groundcache.cxx
+++ b/src/FDM/groundcache.cxx
@@ -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);

diff --git a/src/Scenery/scenery.cxx b/src/Scenery/scenery.cxx
index 84c5b9fad2d2e1006c7a12e2be67d32f6f00275f..13cc67ffcadf120ee5bba41040264e703a19969d 100644 (file)
--- a/src/Scenery/scenery.cxx
+++ b/src/Scenery/scenery.cxx
@@ -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);
         }
       }
     }