mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 03:40:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2483 from akortunov/master

Browse Source 
Revert "Do not use a separate GlowUpdater for every arrow in quiver"
This commit is contained in:
Andrei Kortunov 2019-08-09 21:51:00 +04:00 committed by GitHub
commit 75fc57d1d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -274,12 +274,9 @@ void ActorAnimation::updateQuiver()
{
osg::ref_ptr<osg::Group> arrowNode = ammoNode->getChild(i)->asGroup();
osg::ref_ptr<osg::Node> arrow = mResourceSystem->getSceneManager()->getInstance(model, arrowNode);
if (!ammo->getClass().getEnchantment(*ammo).empty())
mGlowUpdater = SceneUtil::addEnchantedGlow(arrow, mResourceSystem, glowColor);
}
// Assign GlowUpdater for ammo sheathing bone itself to do not attach it to every arrow
ammoNode->setUpdateCallback(nullptr);
if (ammoCount > 0 && !ammo->getClass().getEnchantment(*ammo).empty())
SceneUtil::addEnchantedGlow(ammoNode, mResourceSystem, glowColor);
}
void ActorAnimation::itemAdded(const MWWorld::ConstPtr& item, int /*count*/)