From f2ff6fd9e7865dbf0d6e2867fb2c9b6ea15a13e7 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth@highfidelity.io>
Date: Mon, 23 Jan 2017 15:52:40 -0800
Subject: [PATCH] allow stylus to work when edit.js is running

---
 scripts/system/controllers/handControllerGrab.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js
index 0cf33f3d53..cb64c1671b 100644
--- a/scripts/system/controllers/handControllerGrab.js
+++ b/scripts/system/controllers/handControllerGrab.js
@@ -848,7 +848,9 @@ function MyController(hand) {
     };
 
     this.setState = function(newState, reason) {
-        if (isInEditMode() && newState !== STATE_OFF && newState !== STATE_SEARCHING) {
+        if (isInEditMode() && (newState !== STATE_OFF &&
+                               newState !== STATE_SEARCHING &&
+                               newState !== STATE_OVERLAY_STYLUS_TOUCHING)) {
             return;
         }
         setGrabCommunications((newState === STATE_DISTANCE_HOLDING) || (newState === STATE_NEAR_GRABBING));