From f11735550fbeae426aa0f2675c80764a95d04b94 Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Mon, 13 Jun 2016 18:55:53 -0700
Subject: [PATCH] Fix for Vive RIGHT_GRIP LEFT_GRIP button never becoming zero.

---
 plugins/openvr/src/ViveControllerManager.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/openvr/src/ViveControllerManager.cpp b/plugins/openvr/src/ViveControllerManager.cpp
index 4e17a2edf4..97c502454b 100644
--- a/plugins/openvr/src/ViveControllerManager.cpp
+++ b/plugins/openvr/src/ViveControllerManager.cpp
@@ -370,6 +370,10 @@ void ViveControllerManager::InputDevice::handleButtonEvent(float deltaTime, uint
         } else if (button == vr::k_EButton_SteamVR_Touchpad) {
             _buttonPressedMap.insert(isLeftHand ? LS : RS);
         }
+    } else {
+        if (button == vr::k_EButton_Grip) {
+            _axisStateMap[isLeftHand ? LEFT_GRIP : RIGHT_GRIP] = 0.0f;
+        }
     }
 
     if (touched) {