From 2b8893581231d78a98102404c22467ab0762549d Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 9 Dec 2016 16:15:12 -0800 Subject: [PATCH] Reenable disabling of hand controllers --- scripts/system/controllers/controllerDisplayManager.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/system/controllers/controllerDisplayManager.js b/scripts/system/controllers/controllerDisplayManager.js index 266729bd3b..3965e160a3 100644 --- a/scripts/system/controllers/controllerDisplayManager.js +++ b/scripts/system/controllers/controllerDisplayManager.js @@ -41,14 +41,14 @@ ControllerDisplayManager = function() { }; function updateControllers() { - if (HMD.active && true) { //HMD.shouldShowHandControllers()) { + if (HMD.active && HMD.shouldShowHandControllers()) { var leftConfig = null; var rightConfig = null; if ("Vive" in Controller.Hardware) { leftConfig = VIVE_CONTROLLER_CONFIGURATION_LEFT; rightConfig = VIVE_CONTROLLER_CONFIGURATION_RIGHT; - } + } if ("OculusTouch" in Controller.Hardware) { leftConfig = TOUCH_CONTROLLER_CONFIGURATION_LEFT;