From 87f1e507f3c69486a9a5fda0ff0f3f990f23b971 Mon Sep 17 00:00:00 2001
From: Christophe Riccio <mail@g-truc.net>
Date: Tue, 31 May 2011 19:28:30 +0100
Subject: [PATCH] Fixed mix build on MacOSX

---
 glm/gtc/quaternion.inl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glm/gtc/quaternion.inl b/glm/gtc/quaternion.inl
index e262c663..a5ab33e0 100644
--- a/glm/gtc/quaternion.inl
+++ b/glm/gtc/quaternion.inl
@@ -430,7 +430,7 @@ namespace quaternion{
 	)
     {
 		T angle = acos(dot(x, y));
-		return (sin((T(1) - a) * angle) * x + sin(a * angle) * y) / sin(angle);
+		return (glm::sin((T(1) - a) * angle) * x + glm::sin(a * angle) * y) / glm::sin(angle);
 	}
 
     template <typename T>