From 5a9be817df1fc30898ca988efb5607150d8c93ce Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Wed, 29 Jun 2016 10:28:55 -0700 Subject: [PATCH] PR comments --- interface/resources/qml/ToolWindow.qml | 1 - libraries/shared/src/GLMHelpers.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/interface/resources/qml/ToolWindow.qml b/interface/resources/qml/ToolWindow.qml index c957a37886..f6a4600e06 100644 --- a/interface/resources/qml/ToolWindow.qml +++ b/interface/resources/qml/ToolWindow.qml @@ -140,7 +140,6 @@ ScrollingWindow { if (visible) { for (var i = 0; i < tabView.count; ++i) { if (tabView.getTab(i).enabled) { - console.log("QQQ tab is visible, returning early"); return; } } diff --git a/libraries/shared/src/GLMHelpers.cpp b/libraries/shared/src/GLMHelpers.cpp index 8dbd0a146f..0c02cd5b03 100644 --- a/libraries/shared/src/GLMHelpers.cpp +++ b/libraries/shared/src/GLMHelpers.cpp @@ -468,7 +468,7 @@ glm::mat4 createMatFromScaleQuatAndPos(const glm::vec3& scale, const glm::quat& // cancel out roll glm::quat cancelOutRoll(const glm::quat& q) { - glm::vec3 forward = q * glm::vec3(0.0f, 0.0f, -1.0f); + glm::vec3 forward = q * Vectors::FRONT; return glm::quat_cast(glm::inverse(glm::lookAt(Vectors::ZERO, forward, Vectors::UP))); }