From ec6cae4105767401543339468bc37302d948aaff Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Mon, 11 Sep 2017 17:04:50 +1200
Subject: [PATCH] Fix physics "grabbable" setting being applied without gravity

---
 scripts/vr-edit/vr-edit.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/vr-edit/vr-edit.js b/scripts/vr-edit/vr-edit.js
index 01de12c07c..38f72950f8 100644
--- a/scripts/vr-edit/vr-edit.js
+++ b/scripts/vr-edit/vr-edit.js
@@ -1470,16 +1470,20 @@
             break;
 
         case "setGravityOn":
+            // Dynamic is true if the entity has gravity or is grabbable.
             if (parameter) {
                 physicsToolPhysics.gravity = { x: 0, y: physicsToolGravity, z: 0 };
                 physicsToolPhysics.dynamic = true;
             } else {
                 physicsToolPhysics.gravity = Vec3.ZERO;
-                physicsToolPhysics.dynamic = false;
+                physicsToolPhysics.dynamic = physicsToolPhysics.userData.grabbableKey.grabbable === true;
             }
             break;
         case "setGrabOn":
+            // Dynamic is true if the entity has gravity or is grabbable.
             physicsToolPhysics.userData.grabbableKey.grabbable = parameter;
+            physicsToolPhysics.dynamic = parameter
+                || (physicsToolPhysics.gravity && Vec3.length(physicsToolPhysics.gravity) > 0);
             break;
         case "setCollideOn":
             if (parameter) {