From 08202f8185974b3a573f63371dbbbbaf3f770862 Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Sun, 10 Mar 2019 11:03:51 +0400 Subject: [PATCH] Fix missing null check --- apps/openmw/mwrender/actoranimation.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp index 68b4c2ac85..42f1083550 100644 --- 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;