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

Added .get()'s to fix compilation when ref_ptr<> type conversion is disabled

Browse Source
This commit is contained in:
Robert Osfield
2013-02-05 18:22:46 +00:00
parent f9356603cf
commit 8ed0780967
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgPlugins/trk/ReaderWriterTRK.cpp
View File

@@ -72,7 +72,7 @@ struct AssignDirectionColour
if (!colours)
{
colours = new osg::Vec4Array;
geometry->setColorArray(colours);
geometry->setColorArray(colours.get());
}
geometry->setColorBinding(osg::Geometry::BIND_PER_VERTEX);
colours->resize(vertices->size(), osg::Vec4(0.0,0.0,0.0,0.0));
@@ -82,7 +82,7 @@ struct AssignDirectionColour
if (!normals)
{
normals = new osg::Vec3Array;
geometry->setNormalArray(normals);
geometry->setNormalArray(normals.get());
}
geometry->setNormalBinding(osg::Geometry::BIND_PER_VERTEX);
normals->resize(vertices->size(), osg::Vec3(0.0,0.0,0.0));
@@ -175,7 +175,7 @@ struct AssignDirectionColour
vertexShader = new osg::Shader(osg::Shader::VERTEX, vert_shader_str);
}
program->addShader(vertexShader);
program->addShader(vertexShader.get());
stateset->setAttribute(program.get());
}