Index: /OpenSceneGraph/trunk/src/osgUtil/SceneView.cpp
===================================================================
--- /OpenSceneGraph/trunk/src/osgUtil/SceneView.cpp (revision 10710)
+++ /OpenSceneGraph/trunk/src/osgUtil/SceneView.cpp (revision 10723)
@@ -1039,8 +1039,8 @@
     state->initializeExtensionProcs();
 
-    osg::Texture::TextureObjectManager* tom = osg::Texture::getTextureObjectManager(state->getContextID());
+    osg::Texture::TextureObjectManager* tom = osg::Texture::getTextureObjectManager(state->getContextID()).get();
     tom->newFrame(state->getFrameStamp());
 
-    osg::GLBufferObjectManager* bom = osg::GLBufferObjectManager::getGLBufferObjectManager(state->getContextID());
+    osg::GLBufferObjectManager* bom = osg::GLBufferObjectManager::getGLBufferObjectManager(state->getContextID()).get();
     bom->newFrame(state->getFrameStamp());
 
Index: /OpenSceneGraph/trunk/src/osg/TextureRectangle.cpp
===================================================================
--- /OpenSceneGraph/trunk/src/osg/TextureRectangle.cpp (revision 10710)
+++ /OpenSceneGraph/trunk/src/osg/TextureRectangle.cpp (revision 10723)
@@ -162,5 +162,5 @@
     const unsigned int contextID = state.getContextID();
 
-    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID);
+    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID).get();
     ElapsedTime elapsedTime(&(tom->getApplyTime()));
     tom->getNumberApplied()++;
Index: /OpenSceneGraph/trunk/src/osg/Texture1D.cpp
===================================================================
--- /OpenSceneGraph/trunk/src/osg/Texture1D.cpp (revision 10691)
+++ /OpenSceneGraph/trunk/src/osg/Texture1D.cpp (revision 10723)
@@ -125,5 +125,5 @@
     const unsigned int contextID = state.getContextID();
 
-    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID);
+    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID).get();
     ElapsedTime elapsedTime(&(tom->getApplyTime()));
     tom->getNumberApplied()++;
Index: /OpenSceneGraph/trunk/src/osg/Texture3D.cpp
===================================================================
--- /OpenSceneGraph/trunk/src/osg/Texture3D.cpp (revision 10606)
+++ /OpenSceneGraph/trunk/src/osg/Texture3D.cpp (revision 10723)
@@ -197,5 +197,5 @@
     const unsigned int contextID = state.getContextID();
 
-    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID);
+    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID).get();
     ElapsedTime elapsedTime(&(tom->getApplyTime()));
     tom->getNumberApplied()++;
Index: /OpenSceneGraph/trunk/src/osg/TextureCubeMap.cpp
===================================================================
--- /OpenSceneGraph/trunk/src/osg/TextureCubeMap.cpp (revision 10606)
+++ /OpenSceneGraph/trunk/src/osg/TextureCubeMap.cpp (revision 10723)
@@ -198,5 +198,5 @@
     const unsigned int contextID = state.getContextID();
 
-    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID);
+    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID).get();
     ElapsedTime elapsedTime(&(tom->getApplyTime()));
     tom->getNumberApplied()++;
Index: /OpenSceneGraph/trunk/src/osg/Texture2DArray.cpp
===================================================================
--- /OpenSceneGraph/trunk/src/osg/Texture2DArray.cpp (revision 10606)
+++ /OpenSceneGraph/trunk/src/osg/Texture2DArray.cpp (revision 10723)
@@ -210,5 +210,5 @@
     const unsigned int contextID = state.getContextID();
 
-    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID);
+    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID).get();
     ElapsedTime elapsedTime(&(tom->getApplyTime()));
     tom->getNumberApplied()++;
Index: /OpenSceneGraph/trunk/src/osg/Texture2D.cpp
===================================================================
--- /OpenSceneGraph/trunk/src/osg/Texture2D.cpp (revision 10595)
+++ /OpenSceneGraph/trunk/src/osg/Texture2D.cpp (revision 10723)
@@ -138,5 +138,5 @@
     const unsigned int contextID = state.getContextID();
 
-    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID);
+    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID).get();
     ElapsedTime elapsedTime(&(tom->getApplyTime()));
     tom->getNumberApplied()++;