From 8a434c8ab14bb2de5b84189d1a3d443afe207f04 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 9 Nov 2015 14:10:26 -0800 Subject: [PATCH] don't attempt to near-grab things that aren't physical --- examples/controllers/handControllerGrab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/controllers/handControllerGrab.js b/examples/controllers/handControllerGrab.js index 5035f2e5a4..d308b3dc49 100644 --- a/examples/controllers/handControllerGrab.js +++ b/examples/controllers/handControllerGrab.js @@ -489,7 +489,7 @@ function MyController(hand) { if (grabbableData.wantsTrigger) { this.setState(STATE_NEAR_TRIGGER); return; - } else if (!props.locked) { + } else if (!props.locked && props.collisionsWillMove) { this.setState(STATE_NEAR_GRABBING); return; }