From 621d3e56cfc030ce1444e561dd2c49f6eb41c57d Mon Sep 17 00:00:00 2001 From: Allofich Date: Thu, 16 Feb 2017 19:43:10 +0900 Subject: [PATCH] Fix Clang and OS X Travis CI warnings --- apps/openmw/mwrender/animation.cpp | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp index ec28d4295..30d3a049e 100644 --- a/apps/openmw/mwrender/animation.cpp +++ b/apps/openmw/mwrender/animation.cpp @@ -179,15 +179,6 @@ namespace { } - virtual void apply(osg::Group& node) - { - traverse(node); - } - virtual void apply(osg::MatrixTransform& node) - { - traverse(node); - } - void remove() { for (RemoveVec::iterator it = mToRemove.begin(); it != mToRemove.end(); ++it) @@ -209,6 +200,15 @@ namespace applyImpl(drw); } + virtual void apply(osg::Group& node) + { + traverse(node); + } + virtual void apply(osg::MatrixTransform& node) + { + traverse(node); + } + void applyImpl(osg::Node& node) { osg::NodePath::iterator parent = getNodePath().end()-2; @@ -240,6 +240,15 @@ namespace applyImpl(drw); } + virtual void apply(osg::Group& node) + { + traverse(node); + } + virtual void apply(osg::MatrixTransform& node) + { + traverse(node); + } + void applyImpl(osg::Node& node) { const std::string toFind = "tri bip";