mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-27 04:10:24 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2466 from Capostrophic/doll

Browse source 
[Regression] Avoid confusing inventory doll with player in non-uniform scaling
This commit is contained in:
Andrei Kortunov 2019-08-01 13:10:40 +04:00 committed by GitHub
commit 264a769827
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwclass/npc.cpp
View file

@ -1180,7 +1180,7 @@ namespace MWClass
MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(ref->mBase->mRace); MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(ref->mBase->mRace);
// Race weight should not affect 1st-person meshes, otherwise it will change hand proportions and can break aiming. // Race weight should not affect 1st-person meshes, otherwise it will change hand proportions and can break aiming.
if (ptr == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->isFirstPerson()) if (ptr == MWMechanics::getPlayer() && ptr.isInCell() && MWBase::Environment::get().getWorld()->isFirstPerson())
{ {
if (ref->mBase->isMale()) if (ref->mBase->isMale())
scale *= race->mData.mHeight.mMale; scale *= race->mData.mHeight.mMale;