mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-17 10:21:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2239 from akortunov/warnfix

Browse Source 
[Regression] Fix missing null check
This commit is contained in:
Bret Curtis 2019-03-10 11:38:03 +01:00 committed by GitHub
commit ee03d69d49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/openmw/mwrender/actoranimation.cpp
View File

@ -242,7 +242,8 @@ void ActorAnimation::updateHolsteredWeapon(bool showHolsteredWeapons)
{ {
osg::Vec4f glowColor = getEnchantmentColor(*weapon); osg::Vec4f glowColor = getEnchantmentColor(*weapon);
mScabbard = getWeaponPart(mesh, boneName, isEnchanted, &glowColor); mScabbard = getWeaponPart(mesh, boneName, isEnchanted, &glowColor);
resetControllers(mScabbard->getNode()); if (mScabbard)
resetControllers(mScabbard->getNode());
} }
return; return;