From df6437236ebbf2d74f61250fc6cec73be7615421 Mon Sep 17 00:00:00 2001
From: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Fri, 12 Feb 2016 16:13:12 -0800
Subject: [PATCH] some CR feedback
---
examples/controllers/handControllerGrab.js | 2 +-
interface/src/scripting/HMDScriptingInterface.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/controllers/handControllerGrab.js b/examples/controllers/handControllerGrab.js
index e213834385..92dc86ee02 100644
--- a/examples/controllers/handControllerGrab.js
+++ b/examples/controllers/handControllerGrab.js
@@ -1886,7 +1886,7 @@ function cleanup() {
rightController.cleanup();
leftController.cleanup();
Controller.disableMapping(MAPPING_NAME);
-
+ Controller.setReticleVisible(true);
}
Script.scriptEnding.connect(cleanup);
Script.update.connect(update);
diff --git a/interface/src/scripting/HMDScriptingInterface.cpp b/interface/src/scripting/HMDScriptingInterface.cpp
index d1572a0aa9..1292a870c3 100644
--- a/interface/src/scripting/HMDScriptingInterface.cpp
+++ b/interface/src/scripting/HMDScriptingInterface.cpp
@@ -21,7 +21,7 @@ HMDScriptingInterface::HMDScriptingInterface() {
}
glm::vec3 HMDScriptingInterface::calculateRayUICollisionPoint(const glm::vec3& position, const glm::vec3& direction) const {
- glm::vec3 result { position };
+ glm::vec3 result;
qApp->getApplicationCompositor().calculateRayUICollisionPoint(position, direction, result);
return result;
}