From ac635ccaef70d5fd1229141ca8c5a608bbfd1305 Mon Sep 17 00:00:00 2001
From: Dander7BD <dander.1981@gmail.com>
Date: Fri, 31 Jan 2014 13:47:40 +0100
Subject: [PATCH] SnapAngularAxis fix

---
 Code/OysterMath/LinearMath.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Code/OysterMath/LinearMath.h b/Code/OysterMath/LinearMath.h
index 2fa66e26..0ec46b5c 100644
--- a/Code/OysterMath/LinearMath.h
+++ b/Code/OysterMath/LinearMath.h
@@ -748,12 +748,12 @@ namespace LinearAlgebra3D
 	{ return normalizedAxis * ( vector.Dot(normalizedAxis) ); }
 
 	template<typename ScalarType>
-	::LinearAlgebra::Vector3<ScalarType> & SnapAngularAxis( ::LinearAlgebra::Vector4<ScalarType> &startAngularAxis, const ::LinearAlgebra::Vector4<ScalarType> &localStartNormal, const ::LinearAlgebra::Vector4<ScalarType> &worldEndNormal, ::LinearAlgebra::Vector3<ScalarType> &targetMem = ::LinearAlgebra::Vector3<ScalarType>() )
+	::LinearAlgebra::Vector4<ScalarType> & SnapAngularAxis( ::LinearAlgebra::Vector4<ScalarType> &startAngularAxis, const ::LinearAlgebra::Vector4<ScalarType> &localStartNormal, const ::LinearAlgebra::Vector4<ScalarType> &worldEndNormal, ::LinearAlgebra::Vector4<ScalarType> &targetMem = ::LinearAlgebra::Vector4<ScalarType>() )
 	{
 		::LinearAlgebra::Vector4<ScalarType> worldStartNormal( WorldAxisOf(Rotation(startAngularAxis), localStartNormal), (ScalarType)0 );
-		targetMem = worldStartNormal.xyz.Cross(worldEndNormal.xyz);
+		targetMem = ::LinearAlgebra::Vector4<ScalarType>( worldStartNormal.xyz.Cross(worldEndNormal.xyz), (ScalarType)0);
 		targetMem *= (ScalarType)::std::asin( worldStartNormal.Dot(worldEndNormal) );
-		return targetMem;
+		return targetMem += startAngularAxis;
 	}
 
 	template<typename ScalarType>