Merge pull request #14105 from luiscuenca/bookmarkOnFloorFix

Fix avatar warp into floor when navigating to a saved bookmark
This commit is contained in:
John Conklin II 2018-10-01 16:36:31 -07:00 committed by GitHub
commit 8ad5ca5a67
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -529,7 +529,8 @@ void MyAvatar::update(float deltaTime) {
}
if (_goToFeetAjustment && _skeletonModelLoaded) {
auto feetAjustment = getWorldPosition() - getWorldFeetPosition();
goToLocation(getWorldPosition() + feetAjustment);
_goToPosition = getWorldPosition() + feetAjustment;
setWorldPosition(_goToPosition);
_goToFeetAjustment = false;
}
if (_physicsSafetyPending && qApp->isPhysicsEnabled() && _characterController.isEnabledAndReady()) {