From 225e8e055613526598bfd7181f3d45185711b73b Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Wed, 31 Oct 2018 10:20:21 -0700
Subject: [PATCH] always zero velocity on far-grab release of non-dynamic

---
 .../controllers/controllerModules/farParentGrabEntity.js      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/system/controllers/controllerModules/farParentGrabEntity.js b/scripts/system/controllers/controllerModules/farParentGrabEntity.js
index ac6c41d4d6..f85869aa7f 100644
--- a/scripts/system/controllers/controllerModules/farParentGrabEntity.js
+++ b/scripts/system/controllers/controllerModules/farParentGrabEntity.js
@@ -262,7 +262,9 @@ Script.include("/~/system/libraries/controllers.js");
             if (this.thisFarGrabJointIsParent(endProps)) {
                 Entities.editEntity(this.targetEntityID, {
                     parentID: this.previousParentID[this.targetEntityID],
-                    parentJointIndex: this.previousParentJointIndex[this.targetEntityID]
+                    parentJointIndex: this.previousParentJointIndex[this.targetEntityID],
+                    localVelocity: {x: 0, y: 0, z: 0},
+                    localAngularVelocity: {x: 0, y: 0, z: 0}
                 });
             }