FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Paul Martz, "The attached fixes a few issues that are present when ref_ptr implicit casting is disabled."

Browse Source
This commit is contained in:
Robert Osfield 2012-02-21 17:20:58 +00:00
parent 0b88ad24b2
commit da44e4f4b6
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgPlugins/3ds/ReaderWriter3DS.cpp
View File

@ -1004,7 +1004,7 @@ osg::Drawable* ReaderWriter3DS::ReaderObject::createDrawable(Lib3dsMesh *m,FaceL
osg::ref_ptr<osg::Vec3Array> osg_vertices = new osg::Vec3Array(); osg::ref_ptr<osg::Vec3Array> osg_vertices = new osg::Vec3Array();
osg_vertices->reserve(m->nvertices); 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::ref_ptr<osg::Vec3Array> osg_normals = new osg::Vec3Array();
osg_normals->reserve(m->nvertices); osg_normals->reserve(m->nvertices);

2
src/osgViewer/CompositeViewer.cpp
View File

@ -1037,7 +1037,7 @@ void CompositeViewer::eventTraversal()
hitr != view->getEventHandlers().end(); hitr != view->getEventHandlers().end();
++hitr) ++hitr)
{ {
(*hitr)->handleWithCheckAgainstIgnoreHandledEventsMask( *event, *view, 0, _eventVisitor); (*hitr)->handleWithCheckAgainstIgnoreHandledEventsMask( *event, *view, 0, _eventVisitor.get());
} }
} }
} }

2
src/osgViewer/Viewer.cpp
View File

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