Replaced ref_ptr<>:take with ref_ptr<>:release, and added handling of removeal
of ref_ptr<> operator >.
This commit is contained in:
@@ -7,7 +7,6 @@
|
||||
#include <osg/Geode>
|
||||
#include <osg/ShapeDrawable>
|
||||
#include <osg/PolygonOffset>
|
||||
#include <osg/CullFace>
|
||||
#include <osg/Texture2D>
|
||||
#include <osg/MatrixTransform>
|
||||
#include <osg/Light>
|
||||
|
||||
@@ -95,7 +95,7 @@ osg::Geometry *Frame::build_quad(const Rect &rect, const osg::Vec4 &color, bool
|
||||
|
||||
geo->addPrimitiveSet(new osg::DrawArrays(GL_QUADS, 0, shadow? 12: 4));
|
||||
|
||||
return geo.take();
|
||||
return geo.release();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -243,7 +243,7 @@ osg::Group* build_hud_base(osg::Group* root)
|
||||
osg::ref_ptr<osg::BlendFunc> bf = new osg::BlendFunc;
|
||||
ss->setAttributeAndModes(bf.get());
|
||||
|
||||
return xform.take();
|
||||
return xform.release();
|
||||
}
|
||||
|
||||
EffectPanel* build_gui(osg::Group* root)
|
||||
@@ -256,7 +256,7 @@ EffectPanel* build_gui(osg::Group* root)
|
||||
|
||||
hud->addChild(effect_panel.get());
|
||||
|
||||
return effect_panel.take();
|
||||
return effect_panel.release();
|
||||
}
|
||||
|
||||
void build_world(osg::Group* root, osg::Node* scene, osgProducer::Viewer& viewer)
|
||||
|
||||
Reference in New Issue
Block a user