Changeset 12057 for OpenSceneGraph/trunk/examples/osgterrain/osgterrain.cpp

Timestamp:

12/23/10 10:59:35 (2 years ago)

Author:

robert

Message:

From Jean-Sebastien, "In my auto-build today there are 3 errors caused by using a ref_ptr<T> in a function taking a T* when building without the implicit conversion."

Files:

• OpenSceneGraph/trunk/examples/osgterrain/osgterrain.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/examples/osgterrain/osgterrain.cpp

@@ -199 +199 @@
     }
 
-    osg::ref_ptr<osgTerrain::Terrain> terrain = findTopMostNodeOfType<osgTerrain::Terrain>(rootnode);
+    osg::ref_ptr<osgTerrain::Terrain> terrain = findTopMostNodeOfType<osgTerrain::Terrain>(rootnode.get());
     if (!terrain)
     {
@@ -206 +206 @@
 
         // if CoordinateSystemNode is present copy it's contents into the Terrain, and discard it.
-        osg::CoordinateSystemNode* csn = findTopMostNodeOfType<osg::CoordinateSystemNode>(rootnode);;
+        osg::CoordinateSystemNode* csn = findTopMostNodeOfType<osg::CoordinateSystemNode>(rootnode.get());
         if (csn)
         {
@@ -228 +228 @@
 
     // register our custom handler for adjust Terrain settings
-    viewer.addEventHandler(new TerrainHandler(terrain));
+    viewer.addEventHandler(new TerrainHandler(terrain.get()));
 
     // add a viewport to the viewer and attach the scene graph.