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

Fixed for build with non autoatic ref_ptr<> to C pointer conversion

Browse Source
This commit is contained in:
Robert Osfield
2011-01-14 11:46:43 +00:00
parent b0dd272186
commit a1eabf18b5
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/osgPlugins/vrml/ReaderWriterVRML2.cpp
View File

@@ -216,7 +216,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterVRML2::readNode(const std::string& f
for (unsigned i = 0; i < mfn.size(); i++)
{
openvrml::node *vrml_node = mfn[i].get();
osg_root->addChild(convertFromVRML(vrml_node).get());
osg_root->addChild(convertFromVRML(vrml_node));
}
osgDB::getDataFilePathList().pop_front();
return osg_root.get();
@@ -242,7 +242,7 @@ osgDB::ReaderWriter::WriteResult ReaderWriterVRML2::writeNode(const osg::Node& r
osg::ref_ptr<osg::Node> ReaderWriterVRML2::convertFromVRML(openvrml::node *obj) const
osg::Node* ReaderWriterVRML2::convertFromVRML(openvrml::node *obj) const
{
//static int osgLightNum = 0; //light
@@ -276,7 +276,7 @@ osg::ref_ptr<osg::Node> ReaderWriterVRML2::convertFromVRML(openvrml::node *obj)
// no children
}
return osg_group.get();
return osg_group.release();
}
@@ -302,7 +302,7 @@ osg::ref_ptr<osg::Node> ReaderWriterVRML2::convertFromVRML(openvrml::node *obj)
for (it_npv = node_ptr_vector.begin(); it_npv != node_ptr_vector.end(); it_npv++)
{
openvrml::node *node = (*(it_npv)).get();
osg_m->addChild(convertFromVRML(node).get());
osg_m->addChild(convertFromVRML(node));
}
}
}
@@ -311,7 +311,7 @@ osg::ref_ptr<osg::Node> ReaderWriterVRML2::convertFromVRML(openvrml::node *obj)
// no children
}
return osg_m.get();
return osg_m.release();
}
@@ -503,7 +503,7 @@ osg::ref_ptr<osg::Node> ReaderWriterVRML2::convertFromVRML(openvrml::node *obj)
}
}
return osg_geode.get();
return osg_geode.release();
}
else
{