From e1761430258023faa0547a6af50c2933c09e8aac Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Thu, 27 Sep 2018 16:39:37 -0700 Subject: [PATCH] Make scaleWithParent true by default for parabola picks --- interface/src/raypick/PickScriptingInterface.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/raypick/PickScriptingInterface.cpp b/interface/src/raypick/PickScriptingInterface.cpp index 2e8f790da5..18677fa6e7 100644 --- a/interface/src/raypick/PickScriptingInterface.cpp +++ b/interface/src/raypick/PickScriptingInterface.cpp @@ -158,7 +158,7 @@ unsigned int PickScriptingInterface::createStylusPick(const QVariant& properties * @property {Vec3} [accelerationAxis=-Vec3.UP] The acceleration of the parabola, i.e. the acceleration of the projectile whose trajectory defines the parabola, both magnitude and direction. * @property {boolean} [rotateAccelerationWithAvatar=true] Whether or not the acceleration axis should rotate with the avatar's local Y axis. * @property {boolean} [rotateAccelerationWithParent=false] Whether or not the acceleration axis should rotate with the parent's local Y axis, if available. - * @property {boolean} [scaleWithParent=false] If true, the velocity and acceleration of the Pick will scale linearly with the parent, if available. + * @property {boolean} [scaleWithParent=true] If true, the velocity and acceleration of the Pick will scale linearly with the parent, if available. * @property {boolean} [scaleWithAvatar] Alias for scaleWithParent. Deprecated. */ unsigned int PickScriptingInterface::createParabolaPick(const QVariant& properties) { @@ -199,7 +199,7 @@ unsigned int PickScriptingInterface::createParabolaPick(const QVariant& properti rotateAccelerationWithParent = propMap["rotateAccelerationWithParent"].toBool(); } - bool scaleWithParent = false; + bool scaleWithParent = true; if (propMap["scaleWithParent"].isValid()) { scaleWithParent = propMap["scaleWithParent"].toBool(); } else if (propMap["scaleWithAvatar"].isValid()) {