From ebd701a1ab689679f0d9a6beac77e6d2715ddec6 Mon Sep 17 00:00:00 2001 From: samcake Date: Tue, 21 Nov 2017 14:40:37 -0800 Subject: [PATCH] Merging with master --- interface/src/raypick/StylusPick.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/raypick/StylusPick.cpp b/interface/src/raypick/StylusPick.cpp index 5ae7cff5e5..f15b2c13f1 100644 --- a/interface/src/raypick/StylusPick.cpp +++ b/interface/src/raypick/StylusPick.cpp @@ -107,8 +107,8 @@ static StylusTip getControllerWorldLocation(Side side) { float sensorScaleFactor = myAvatar->getSensorToWorldScale(); auto controllerJointIndex = myAvatar->getJointIndex(sideData.cameraJoint); - const auto avatarOrientation = myAvatar->getOrientation(); - const auto avatarPosition = myAvatar->getPosition(); + const auto avatarOrientation = myAvatar->getWorldOrientation(); + const auto avatarPosition = myAvatar->getWorldPosition(); result.orientation = avatarOrientation * myAvatar->getAbsoluteJointRotationInObjectFrame(controllerJointIndex); result.position = avatarPosition + (avatarOrientation * myAvatar->getAbsoluteJointTranslationInObjectFrame(controllerJointIndex));