Changeset 10723

Show
Ignore:
Timestamp:
11/06/09 17:09:55 (4 years ago)
Author:
robert
Message:

Fixed build with no automatic conversion of ref_ptr<> to C pointer

Location:
OpenSceneGraph/trunk/src
Files:
7 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/trunk/src/osg/Texture1D.cpp

    r10691 r10723  
    125125    const unsigned int contextID = state.getContextID(); 
    126126 
    127     Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID); 
     127    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID).get(); 
    128128    ElapsedTime elapsedTime(&(tom->getApplyTime())); 
    129129    tom->getNumberApplied()++; 

  • OpenSceneGraph/trunk/src/osg/Texture2D.cpp

    r10595 r10723  
    138138    const unsigned int contextID = state.getContextID(); 
    139139 
    140     Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID); 
     140    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID).get(); 
    141141    ElapsedTime elapsedTime(&(tom->getApplyTime())); 
    142142    tom->getNumberApplied()++; 

  • OpenSceneGraph/trunk/src/osg/Texture2DArray.cpp

    r10606 r10723  
    210210    const unsigned int contextID = state.getContextID(); 
    211211 
    212     Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID); 
     212    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID).get(); 
    213213    ElapsedTime elapsedTime(&(tom->getApplyTime())); 
    214214    tom->getNumberApplied()++; 

  • OpenSceneGraph/trunk/src/osg/Texture3D.cpp

    r10606 r10723  
    197197    const unsigned int contextID = state.getContextID(); 
    198198 
    199     Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID); 
     199    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID).get(); 
    200200    ElapsedTime elapsedTime(&(tom->getApplyTime())); 
    201201    tom->getNumberApplied()++; 

  • OpenSceneGraph/trunk/src/osg/TextureCubeMap.cpp

    r10606 r10723  
    198198    const unsigned int contextID = state.getContextID(); 
    199199 
    200     Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID); 
     200    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID).get(); 
    201201    ElapsedTime elapsedTime(&(tom->getApplyTime())); 
    202202    tom->getNumberApplied()++; 

  • OpenSceneGraph/trunk/src/osg/TextureRectangle.cpp

    r10710 r10723  
    162162    const unsigned int contextID = state.getContextID(); 
    163163 
    164     Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID); 
     164    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID).get(); 
    165165    ElapsedTime elapsedTime(&(tom->getApplyTime())); 
    166166    tom->getNumberApplied()++; 

  • OpenSceneGraph/trunk/src/osgUtil/SceneView.cpp

    r10710 r10723  
    10391039    state->initializeExtensionProcs(); 
    10401040 
    1041     osg::Texture::TextureObjectManager* tom = osg::Texture::getTextureObjectManager(state->getContextID()); 
     1041    osg::Texture::TextureObjectManager* tom = osg::Texture::getTextureObjectManager(state->getContextID()).get(); 
    10421042    tom->newFrame(state->getFrameStamp()); 
    10431043 
    1044     osg::GLBufferObjectManager* bom = osg::GLBufferObjectManager::getGLBufferObjectManager(state->getContextID()); 
     1044    osg::GLBufferObjectManager* bom = osg::GLBufferObjectManager::getGLBufferObjectManager(state->getContextID()).get(); 
    10451045    bom->newFrame(state->getFrameStamp()); 
    10461046