mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-05-06 12:41:23 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2046 from akortunov/holstered_weapons

Browse source 
Fix visible sheaths for invisible actors
This commit is contained in:
Bret Curtis 2018-11-25 01:10:11 +01:00 committed by GitHub
commit 10a049b087
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwrender/actoranimation.cpp
View file

@ -355,10 +355,6 @@ void ActorAnimation::updateQuiver()
addGlow(arrow, glowColor);
}
}
// recreate shaders for invisible actors, otherwise new nodes will be visible
if (mAlpha != 1.f)
mResourceSystem->getSceneManager()->recreateShaders(mObjectRoot);
}
void ActorAnimation::itemAdded(const MWWorld::ConstPtr& item, int /*count*/)

4
apps/openmw/mwrender/npcanimation.cpp
View file

@ -925,6 +925,10 @@ void NpcAnimation::showWeapons(bool showWeapon)
updateHolsteredWeapon(!mShowWeapons);
updateQuiver();
// Recreate shaders for invisible actors, otherwise sheath nodes will be visible
if (mAlpha != 1.f && mWeaponSheathing)
mResourceSystem->getSceneManager()->recreateShaders(mObjectRoot);
}
void NpcAnimation::showCarriedLeft(bool show)