Changeset 25

Show
Ignore:
Timestamp:
10/30/08 14:41:56
Author:
robert
Message:

Builder fixes for svn/trunk version of OSG.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/SlideShowConstructor.cpp

    r14 r25  
    762762 
    763763    osg::ref_ptr<osg::Image> imageLeft = osgDB::readImageFile(filenameLeft); 
    764     osg::ref_ptr<osg::Image> imageRight = filenameRight==filenameLeft ? imageLeft : osgDB::readImageFile(filenameRight); 
     764    osg::ref_ptr<osg::Image> imageRight = (filenameRight==filenameLeft) ? imageLeft.get() : osgDB::readImageFile(filenameRight); 
    765765     
    766766    if (!imageLeft && !imageRight) return; 

  • trunk/src/present3D.cpp

    r24 r25  
    342342    { 
    343343        // make sure that imagery stays around after being applied to textures. 
    344         osgDB::Registry::instance()->getOrCreateDatabasePager()->setUnrefImageDataAfterApplyPolicy(true,false); 
     344        viewer.getDatabasePager()->setUnrefImageDataAfterApplyPolicy(true,false); 
    345345        // optimizer_options &= ~osgUtil::Optimizer::OPTIMIZE_TEXTURE_SETTINGS; 
    346346        // viewer.setRealizeSceneViewOptions(viewer.getRealizeSceneViewOptions() & ~osgUtil::SceneView::COMPILE_GLOBJECTS_AT_INIT);