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

Fixed redundent checks and clean up clone usage

Browse Source
This commit is contained in:
Robert Osfield
2016-06-02 14:36:38 +01:00
parent d6b6d10611
commit 9dee2ecf33
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgText/Glyph.cpp
View File

@@ -618,10 +618,10 @@ void GlyphGeometry::setup(const Glyph3D* glyph, const Style* style)
OSG_INFO<<"GlyphGeometry::setup(const Glyph* glyph, NULL) create glyph geometry with custom Style."<<std::endl;
// record the style
_style = dynamic_cast<Style*>(style->clone(osg::CopyOp::DEEP_COPY_ALL));
_style = osg::clone(style, osg::CopyOp::DEEP_COPY_ALL);
const Bevel* bevel = style ? style->getBevel() : 0;
bool outline = style ? style->getOutlineRatio()>0.0f : false;
const Bevel* bevel = style->getBevel();
bool outline = style->getOutlineRatio()>0.0f;
float width = style->getThicknessRatio();
if (bevel)