Show
Ignore:
Timestamp:
09/19/14 12:35:23 (2 days ago)
Author:
robert
Message:

Moved widgets from VolumeEditorWidget? to TransferFunctionWidget?, and widget utilities into WidgetUtils?.

Files:
1 modified

Legend:

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

    r13041 r13130  
    11511151        getState()->setGraphicsContext(this); 
    11521152 
    1153         if (_traits.valid() && _traits->sharedContext) 
     1153        if (_traits.valid() && _traits->sharedContext.valid()) 
    11541154        { 
    11551155            getState()->setContextID( _traits->sharedContext->getState()->getContextID() ); 
     
    19041904    } 
    19051905 
    1906     if (_traits.valid() && (_traits->sharedContext || _traits->vsync || _traits->swapGroupEnabled)) 
     1906    if (_traits.valid() && (_traits->sharedContext.valid() || _traits->vsync || _traits->swapGroupEnabled)) 
    19071907    { 
    19081908        // make context current so we can test capabilities and set up context sharing 
     
    19331933 
    19341934        // set up sharing of contexts if required 
    1935         GraphicsHandleWin32* graphicsHandleWin32 = dynamic_cast<GraphicsHandleWin32*>(_traits->sharedContext); 
     1935        GraphicsHandleWin32* graphicsHandleWin32 = dynamic_cast<GraphicsHandleWin32*>(_traits->sharedContext.get()); 
    19361936        if (graphicsHandleWin32) 
    19371937        {