Show
Ignore:
Timestamp:
12/23/10 10:59:35 (3 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:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/examples/osgterrain/osgterrain.cpp

    r11992 r12057  
    199199    } 
    200200 
    201     osg::ref_ptr<osgTerrain::Terrain> terrain = findTopMostNodeOfType<osgTerrain::Terrain>(rootnode); 
     201    osg::ref_ptr<osgTerrain::Terrain> terrain = findTopMostNodeOfType<osgTerrain::Terrain>(rootnode.get()); 
    202202    if (!terrain) 
    203203    { 
     
    206206 
    207207        // if CoordinateSystemNode is present copy it's contents into the Terrain, and discard it. 
    208         osg::CoordinateSystemNode* csn = findTopMostNodeOfType<osg::CoordinateSystemNode>(rootnode);; 
     208        osg::CoordinateSystemNode* csn = findTopMostNodeOfType<osg::CoordinateSystemNode>(rootnode.get()); 
    209209        if (csn) 
    210210        { 
     
    228228 
    229229    // register our custom handler for adjust Terrain settings 
    230     viewer.addEventHandler(new TerrainHandler(terrain)); 
     230    viewer.addEventHandler(new TerrainHandler(terrain.get())); 
    231231 
    232232    // add a viewport to the viewer and attach the scene graph.