teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge pull request #1211 from Allofich/warnings

Browse source 
Fix Clang and OS X Travis CI warnings
This commit is contained in:
scrawl 2017-02-16 19:16:53 +01:00 committed by GitHub
commit 96ca50e108
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
apps/openmw/mwrender/animation.cpp
View file

@ -179,15 +179,6 @@ namespace
{ {
} }
virtual void apply(osg::Group& node)
{
traverse(node);
}
virtual void apply(osg::MatrixTransform& node)
{
traverse(node);
}
void remove() void remove()
{ {
for (RemoveVec::iterator it = mToRemove.begin(); it != mToRemove.end(); ++it) for (RemoveVec::iterator it = mToRemove.begin(); it != mToRemove.end(); ++it)
@ -209,6 +200,15 @@ namespace
applyImpl(drw); applyImpl(drw);
} }
virtual void apply(osg::Group& node)
{
traverse(node);
}
virtual void apply(osg::MatrixTransform& node)
{
traverse(node);
}
void applyImpl(osg::Node& node) void applyImpl(osg::Node& node)
{ {
osg::NodePath::iterator parent = getNodePath().end()-2; osg::NodePath::iterator parent = getNodePath().end()-2;
@ -240,6 +240,15 @@ namespace
applyImpl(drw); applyImpl(drw);
} }
virtual void apply(osg::Group& node)
{
traverse(node);
}
virtual void apply(osg::MatrixTransform& node)
{
traverse(node);
}
void applyImpl(osg::Node& node) void applyImpl(osg::Node& node)
{ {
const std::string toFind = "tri bip"; const std::string toFind = "tri bip";