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

From Jeremy Moles, fixed style == operator.

Browse Source
This commit is contained in:
Robert Osfield 2011-06-13 08:52:11 +00:00
parent 0dbb4004d7
commit c034333400
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/osgText/Style.cpp
View File

@ -27,7 +27,8 @@ Bevel::Bevel()
flatBevel(); flatBevel();
} }
Bevel::Bevel(const Bevel& bevel, const osg::CopyOp&): Bevel::Bevel(const Bevel& bevel, const osg::CopyOp& copyop):
osg::Object(bevel, copyop),
_thickness(bevel._thickness), _thickness(bevel._thickness),
_vertices(bevel._vertices) _vertices(bevel._vertices)
{ {
@ -155,12 +156,15 @@ bool Style::operator == (const Style& rhs) const
if (!(*_bevel == *rhs._bevel)) return false; if (!(*_bevel == *rhs._bevel)) return false;
} }
if (rhs._bevel.valid()) return false; else
{
if (rhs._bevel.valid()) return false;
}
if (_widthRatio != rhs._widthRatio) return false; if (_widthRatio != rhs._widthRatio) return false;
if (_thicknessRatio != rhs._thicknessRatio) return false; if (_thicknessRatio != rhs._thicknessRatio) return false;
if (_outlineRatio != rhs._outlineRatio) return false; if (_outlineRatio != rhs._outlineRatio) return false;
if (_sampleDensity != rhs._sampleDensity) return false; if (_sampleDensity != rhs._sampleDensity) return false;
return false; return true;
} }