From Paul Martz, "The attached fixes a few issues that are present wh…

…en ref_ptr implicit casting is disabled."
openscenegraph · Feb 21, 2012 · 89dcde3 · 89dcde3
1 parent 4406a49
commit 89dcde3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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::Vec3Array> osg_vertices = new osg::Vec3Array();
     osg_vertices->reserve(m->nvertices);
-    geom->setVertexArray(osg_vertices);
+    geom->setVertexArray(osg_vertices.get());
 
     osg::ref_ptr<osg::Vec3Array> osg_normals = new osg::Vec3Array();
     osg_normals->reserve(m->nvertices);

diff --git 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
@@ -954,7 +954,7 @@ void Viewer::eventTraversal()
             hitr != _eventHandlers.end();
             ++hitr)
         {
-            (*hitr)->handleWithCheckAgainstIgnoreHandledEventsMask( *event, *this, 0, _eventVisitor);
+            (*hitr)->handleWithCheckAgainstIgnoreHandledEventsMask( *event, *this, 0, _eventVisitor.get());
         }
 
     }