Show
Ignore:
Timestamp:
07/06/07 15:08:51 (7 years ago)
Author:
robert
Message:

Added include/osg/GLObjects + .cpp which provide osg::flush*DeletedGLObjects() methods.

Added and cleaned up DeleteHandler? calls in osgViewer to help avoid crashes on exit.

Changed DatabasePager? across to dynamically checcking osg::getCompileContext(..)

Updated wrappers.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCarbon.cpp

    r7066 r7074  
    344344     
    345345    /** dtor */ 
    346     ~OSXCarbonWindowingSystemInterface() { 
    347         if (_displayIds) 
    348             delete[] _displayIds; 
     346    ~OSXCarbonWindowingSystemInterface() 
     347    { 
     348        if (osg::Referenced::getDeleteHandler()) 
     349        { 
     350            osg::Referenced::getDeleteHandler()->setNumFramesToRetainObjects(0); 
     351            osg::Referenced::getDeleteHandler()->flushAll(); 
     352        } 
     353 
     354        if (_displayIds) delete[] _displayIds; 
    349355        _displayIds = NULL; 
    350356    } 
     
    11351141    ~RegisterWindowingSystemInterfaceProxy() 
    11361142    { 
     1143        if (osg::Referenced::getDeleteHandler()) 
     1144        { 
     1145            osg::Referenced::getDeleteHandler()->setNumFramesToRetainObjects(0); 
     1146            osg::Referenced::getDeleteHandler()->flushAll(); 
     1147        } 
     1148 
    11371149        osg::GraphicsContext::setWindowingSystemInterface(0); 
    11381150    }