From 9dee2ecf3353b896ba564853dd1f5b08757f1885 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 2 Jun 2016 14:36:38 +0100 Subject: [PATCH] Fixed redundent checks and clean up clone usage --- src/osgText/Glyph.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osgText/Glyph.cpp b/src/osgText/Glyph.cpp index 27566ff4a..068ce1fb0 100644 --- a/src/osgText/Glyph.cpp +++ b/src/osgText/Glyph.cpp @@ -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."<(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)