Merge pull request #1741 from akortunov/master

Do not reset mUpperBodyState for weapon->weapon switch
This commit is contained in:
Bret Curtis 2018-06-10 11:56:54 +02:00 committed by GitHub
commit 926ddcd47e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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));