Merge pull request #2239 from akortunov/warnfix

[Regression] Fix missing null check
6 years ago · ee03d69d49
parent 4a597d94d3 08202f8185
commit ee03d69d49
1 changed files with 2 additions and 1 deletions
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@ -242,7 +242,8 @@ void ActorAnimation::updateHolsteredWeapon(bool showHolsteredWeapons)
        {
            osg::Vec4f glowColor = getEnchantmentColor(*weapon);
            mScabbard = getWeaponPart(mesh, boneName, isEnchanted, &glowColor);
-            resetControllers(mScabbard->getNode());
+            if (mScabbard)
+                resetControllers(mScabbard->getNode());
        }

        return;