From da44e4f4b695679669087d7b632eb61c0982a5d0 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 21 Feb 2012 17:20:58 +0000 Subject: [PATCH] From Paul Martz, "The attached fixes a few issues that are present when ref_ptr implicit casting is disabled." --- src/osgPlugins/3ds/ReaderWriter3DS.cpp | 2 +- src/osgViewer/CompositeViewer.cpp | 2 +- src/osgViewer/Viewer.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osgPlugins/3ds/ReaderWriter3DS.cpp b/src/osgPlugins/3ds/ReaderWriter3DS.cpp index 401541615..c5d8f9d1f 100644 --- a/src/osgPlugins/3ds/ReaderWriter3DS.cpp +++ b/src/osgPlugins/3ds/ReaderWriter3DS.cpp @@ -1004,7 +1004,7 @@ osg::Drawable* ReaderWriter3DS::ReaderObject::createDrawable(Lib3dsMesh *m,FaceL osg::ref_ptr osg_vertices = new osg::Vec3Array(); osg_vertices->reserve(m->nvertices); - geom->setVertexArray(osg_vertices); + geom->setVertexArray(osg_vertices.get()); osg::ref_ptr osg_normals = new osg::Vec3Array(); osg_normals->reserve(m->nvertices); diff --git a/src/osgViewer/CompositeViewer.cpp b/src/osgViewer/CompositeViewer.cpp index ca5dd38b2..7707b296e 100644 --- a/src/osgViewer/CompositeViewer.cpp +++ b/src/osgViewer/CompositeViewer.cpp @@ -1037,7 +1037,7 @@ void CompositeViewer::eventTraversal() hitr != view->getEventHandlers().end(); ++hitr) { - (*hitr)->handleWithCheckAgainstIgnoreHandledEventsMask( *event, *view, 0, _eventVisitor); + (*hitr)->handleWithCheckAgainstIgnoreHandledEventsMask( *event, *view, 0, _eventVisitor.get()); } } } diff --git a/src/osgViewer/Viewer.cpp b/src/osgViewer/Viewer.cpp index 76e746af6..28b694b44 100644 --- a/src/osgViewer/Viewer.cpp +++ b/src/osgViewer/Viewer.cpp @@ -954,7 +954,7 @@ void Viewer::eventTraversal() hitr != _eventHandlers.end(); ++hitr) { - (*hitr)->handleWithCheckAgainstIgnoreHandledEventsMask( *event, *this, 0, _eventVisitor); + (*hitr)->handleWithCheckAgainstIgnoreHandledEventsMask( *event, *this, 0, _eventVisitor.get()); } }