Merge pull request #1741 from akortunov/master

Do not reset mUpperBodyState for weapon->weapon switch
pull/456/head
Bret Curtis 7 years ago committed by GitHub
commit 926ddcd47e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1214,7 +1214,6 @@ bool CharacterController::updateWeaponState()
bool animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete);
if (!animPlaying || complete >= 1.0f)
{
mUpperBodyState = UpperCharState_Nothing;
forcestateupdate = true;
mAnimation->showCarriedLeft(updateCarriedLeftVisible(weaptype));

Loading…
Cancel
Save