mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-25 15:35:23 +00:00
Merge pull request #2876 from Capostrophic/blending
Reenable weapon animation lower body anim blending in first person view (#5441)
This commit is contained in:
commit
6f2fdb990b
@ -19,6 +19,7 @@
|
||||
Bug #5424: Creatures do not headtrack player
|
||||
Bug #5425: Poison effect only appears for one frame
|
||||
Bug #5427: GetDistance unknown ID error is misleading
|
||||
Bug #5441: Enemies can't push a player character when in critical strike stance
|
||||
Feature #5362: Show the soul gems' trapped soul in count dialog
|
||||
|
||||
0.46.0
|
||||
|
@ -1260,10 +1260,9 @@ bool CharacterController::updateWeaponState(CharacterState& idle)
|
||||
}
|
||||
}
|
||||
|
||||
// Use blending only with 3d-person movement animations for bipedal actors
|
||||
bool firstPersonPlayer = (mPtr == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->isFirstPerson());
|
||||
// For biped actors, blend weapon animations with lower body animations with higher priority
|
||||
MWRender::Animation::AnimPriority priorityWeapon(Priority_Weapon);
|
||||
if (!firstPersonPlayer && mPtr.getClass().isBipedal(mPtr))
|
||||
if (mPtr.getClass().isBipedal(mPtr))
|
||||
priorityWeapon[MWRender::Animation::BoneGroup_LowerBody] = Priority_WeaponLowerBody;
|
||||
|
||||
bool forcestateupdate = false;
|
||||
|
Loading…
x
Reference in New Issue
Block a user