From 5d2409136429cc870ab9f3c09167dc92358a8f5c Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Wed, 1 Jul 2015 15:06:38 +0200
Subject: [PATCH 1/2] Fix build error and a pair of warnings

The error was about casting between osg::Callback* and osg::NodeCallback*
The warnings are both about virtual classes with non-virtual destructors
---
 apps/openmw/mwrender/animation.hpp       | 1 +
 apps/openmw/mwrender/sky.cpp             | 4 ++--
 apps/openmw/mwrender/weaponanimation.hpp | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 73079e9a9b..d45d19cf91 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -93,6 +93,7 @@ protected:
         boost::shared_ptr<float> mTimePtr;
 
     public:
+        virtual ~AnimationTime() { }
 
         void setTimePtr(boost::shared_ptr<float> time)
         { mTimePtr = time; }
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index dc43783ff5..c7b0d3e41b 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -721,12 +721,12 @@ public:
                 if (stateset->getAttribute(osg::StateAttribute::MATERIAL))
                 {
                     SceneUtil::CompositeStateSetUpdater* composite = NULL;
-                    osg::NodeCallback* callback = node.getUpdateCallback();
+                    osg::NodeCallback* callback = dynamic_cast<osg::NodeCallback*>(node.getUpdateCallback());
                     while (callback)
                     {
                         if ((composite = dynamic_cast<SceneUtil::CompositeStateSetUpdater*>(callback)))
                             break;
-                        callback = callback->getNestedCallback();
+                        callback = dynamic_cast<osg::NodeCallback*>(callback->getNestedCallback());
                     }
 
                     if (composite)
diff --git a/apps/openmw/mwrender/weaponanimation.hpp b/apps/openmw/mwrender/weaponanimation.hpp
index 3bf0fb7211..fae4596115 100644
--- a/apps/openmw/mwrender/weaponanimation.hpp
+++ b/apps/openmw/mwrender/weaponanimation.hpp
@@ -19,6 +19,8 @@ namespace MWRender
         float mStartTime;
     public:
         WeaponAnimationTime(Animation* animation) : mAnimation(animation), mStartTime(0) {}
+        virtual ~WeaponAnimationTime() { }
+
         void setGroup(const std::string& group);
         void updateStartTime();
 

From aaaee74a4db0cc3ba1c5760b91efff1066d99b4f Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Sun, 5 Jul 2015 21:44:17 +0200
Subject: [PATCH 2/2] Fix the comments

---
 apps/openmw/mwrender/animation.hpp       | 1 -
 apps/openmw/mwrender/sky.cpp             | 9 +++++++--
 apps/openmw/mwrender/weaponanimation.hpp | 2 --
 components/sceneutil/controller.hpp      | 1 +
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index d45d19cf91..73079e9a9b 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -93,7 +93,6 @@ protected:
         boost::shared_ptr<float> mTimePtr;
 
     public:
-        virtual ~AnimationTime() { }
 
         void setTimePtr(boost::shared_ptr<float> time)
         { mTimePtr = time; }
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index c7b0d3e41b..d9a2128897 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -8,6 +8,7 @@
 #include <osg/PositionAttitudeTransform>
 #include <osg/TexEnvCombine>
 #include <osg/TexMat>
+#include <osg/Version>
 
 #include <osgParticle/ParticleSystem>
 #include <osgParticle/ParticleSystemUpdater>
@@ -721,12 +722,16 @@ public:
                 if (stateset->getAttribute(osg::StateAttribute::MATERIAL))
                 {
                     SceneUtil::CompositeStateSetUpdater* composite = NULL;
-                    osg::NodeCallback* callback = dynamic_cast<osg::NodeCallback*>(node.getUpdateCallback());
+#if OSG_MIN_VERSION_REQUIRED(3,3,3)
+                    osg::Callback* callback = node.getUpdateCallback();
+#else
+                    osg::NodeCallback* callback = node.getUpdateCallback();
+#endif
                     while (callback)
                     {
                         if ((composite = dynamic_cast<SceneUtil::CompositeStateSetUpdater*>(callback)))
                             break;
-                        callback = dynamic_cast<osg::NodeCallback*>(callback->getNestedCallback());
+                        callback = callback->getNestedCallback();
                     }
 
                     if (composite)
diff --git a/apps/openmw/mwrender/weaponanimation.hpp b/apps/openmw/mwrender/weaponanimation.hpp
index fae4596115..3bf0fb7211 100644
--- a/apps/openmw/mwrender/weaponanimation.hpp
+++ b/apps/openmw/mwrender/weaponanimation.hpp
@@ -19,8 +19,6 @@ namespace MWRender
         float mStartTime;
     public:
         WeaponAnimationTime(Animation* animation) : mAnimation(animation), mStartTime(0) {}
-        virtual ~WeaponAnimationTime() { }
-
         void setGroup(const std::string& group);
         void updateStartTime();
 
diff --git a/components/sceneutil/controller.hpp b/components/sceneutil/controller.hpp
index 0ef1356e77..7399ecad58 100644
--- a/components/sceneutil/controller.hpp
+++ b/components/sceneutil/controller.hpp
@@ -11,6 +11,7 @@ namespace SceneUtil
     class ControllerSource
     {
     public:
+        virtual ~ControllerSource() { }
         virtual float getValue(osg::NodeVisitor* nv) = 0;
     };