From 118d05d824935f6dfd067c41e2b31667fe6b0227 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 11 Nov 2015 17:24:50 -0800
Subject: [PATCH] Use a clearer function

---
 libraries/shared/src/GLMHelpers.cpp | 2 +-
 libraries/shared/src/GLMHelpers.h   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/shared/src/GLMHelpers.cpp b/libraries/shared/src/GLMHelpers.cpp
index b57754066b..fa010a85bd 100644
--- a/libraries/shared/src/GLMHelpers.cpp
+++ b/libraries/shared/src/GLMHelpers.cpp
@@ -201,7 +201,7 @@ float angleBetween(const glm::vec3& v1, const glm::vec3& v2) {
 
 //  Helper function return the rotation from the first vector onto the second
 glm::quat rotationBetween(const glm::vec3& v1, const glm::vec3& v2) {
-    return glm::quat(glm::normalize(v1), glm::normalize(v2));
+    return glm::rotation(glm::normalize(v1), glm::normalize(v2));
 }
 
 bool isPointBehindTrianglesPlane(glm::vec3 point, glm::vec3 p0, glm::vec3 p1, glm::vec3 p2) {
diff --git a/libraries/shared/src/GLMHelpers.h b/libraries/shared/src/GLMHelpers.h
index 9c1bbe23a4..8d3410aaf2 100644
--- a/libraries/shared/src/GLMHelpers.h
+++ b/libraries/shared/src/GLMHelpers.h
@@ -16,6 +16,7 @@
 
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>
+#include <glm/gtx/quaternion.hpp>
 
 // Bring the most commonly used GLM types into the default namespace
 using glm::ivec2;