Replaced ref_ptr<>:take with ref_ptr<>:release, and added handling of removeal

of ref_ptr<> operator >.
This commit is contained in:
Robert Osfield
2006-06-26 20:45:51 +00:00
parent 5b89ddab01
commit 240fc9ebee
12 changed files with 18 additions and 22 deletions

View File

@@ -130,7 +130,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterLWO::readNode_LWO2(const std::string
lwosg::Converter converter(conv_options, options);
osg::ref_ptr<osg::Node> node = converter.convert(fileName);
if (node.valid()) {
return node.take();
return node.release();
}
return ReadResult::FILE_NOT_HANDLED;
@@ -143,7 +143,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterLWO::readNode_old_LWO2(const std::st
if (lwo2->ReadFile(fileName))
{
osg::ref_ptr<Group> group = new osg::Group();
if (lwo2->GenerateGroup(*group)) return group.take();
if (lwo2->GenerateGroup(*group)) return group.release();
}
return ReadResult::FILE_NOT_HANDLED;
}