From 08f06c6c2d6f89eeea5c85a6dc82ec92e5fcc802 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 1 Mar 2016 16:57:11 +0100
Subject: [PATCH] Fix a crash that could occur with actors that define 'bip01
 spine1' but do not define 'bip01 spine2' (Fixes #3223).

---
 apps/openmw/mwrender/weaponanimation.cpp | 25 +++++++++++++++---------
 apps/openmw/mwrender/weaponanimation.hpp |  3 +++
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwrender/weaponanimation.cpp b/apps/openmw/mwrender/weaponanimation.cpp
index 2627d3fc6..d5fb70d16 100644
--- a/apps/openmw/mwrender/weaponanimation.cpp
+++ b/apps/openmw/mwrender/weaponanimation.cpp
@@ -182,23 +182,30 @@ void WeaponAnimation::deleteControllers()
 
 void WeaponAnimation::configureControllers(float characterPitchRadians)
 {
-    if (!mSpineControllers[0])
-        return;
-
     if (mPitchFactor == 0.f || characterPitchRadians == 0.f)
     {
-        for (int i=0; i<2; ++i)
-            mSpineControllers[i]->setEnabled(false);
+        setControllerEnabled(false);
         return;
     }
 
     float pitch = characterPitchRadians * mPitchFactor;
     osg::Quat rotate (pitch/2, osg::Vec3f(-1,0,0));
+    setControllerRotate(rotate);
+    setControllerEnabled(true);
+}
+
+void WeaponAnimation::setControllerRotate(const osg::Quat& rotate)
+{
     for (int i=0; i<2; ++i)
-    {
-        mSpineControllers[i]->setRotate(rotate);
-        mSpineControllers[i]->setEnabled(true);
-    }
+        if (mSpineControllers[i])
+            mSpineControllers[i]->setRotate(rotate);
+}
+
+void WeaponAnimation::setControllerEnabled(bool enabled)
+{
+    for (int i=0; i<2; ++i)
+        if (mSpineControllers[i])
+            mSpineControllers[i]->setEnabled(enabled);
 }
 
 }
diff --git a/apps/openmw/mwrender/weaponanimation.hpp b/apps/openmw/mwrender/weaponanimation.hpp
index 3bf0fb721..d50729c62 100644
--- a/apps/openmw/mwrender/weaponanimation.hpp
+++ b/apps/openmw/mwrender/weaponanimation.hpp
@@ -52,6 +52,9 @@ namespace MWRender
 
         osg::ref_ptr<RotateController> mSpineControllers[2];
 
+        void setControllerRotate(const osg::Quat& rotate);
+        void setControllerEnabled(bool enabled);
+
         virtual osg::Group* getArrowBone() = 0;
         virtual osg::Node* getWeaponNode() = 0;
         virtual Resource::ResourceSystem* getResourceSystem() = 0;