diff options
author | Nick Samarin <nicks1987@bigmir.net> | 2010-07-22 00:54:53 +0400 |
---|---|---|
committer | Nick Samarin <nicks1987@bigmir.net> | 2010-07-22 00:54:53 +0400 |
commit | c6ea23c77c441e49ba171b6d58f1601971d3f222 (patch) | |
tree | 0855d60a3ac9bf1699313ab2633cdde502d4e75a /source/gameengine/Ketsji/KX_GameObject.cpp | |
parent | b7819807b33ded7c20956c52bcaf1ee93bf428f7 (diff) | |
parent | 969c0fd718ed500fedfdeb1b4a5c0026febdb975 (diff) |
synched with trunk at revision 30597
Diffstat (limited to 'source/gameengine/Ketsji/KX_GameObject.cpp')
-rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index dea85f87da8..d135e3d9d7b 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -862,7 +862,7 @@ void KX_GameObject::AlignAxisToVect(const MT_Vector3& dir, int axis, float fac) { case 0: //x axis ori.setValue(orimat[0][2], orimat[1][2], orimat[2][2]); //pivot axis - if (MT_abs(vect.dot(ori)) > 1.0-3.0*MT_EPSILON) //is the vector paralell to the pivot? + if (MT_abs(vect.dot(ori)) > 1.0-3.0*MT_EPSILON) //is the vector parallel to the pivot? ori.setValue(orimat[0][1], orimat[1][1], orimat[2][1]); //change the pivot! if (fac == 1.0) { x = vect; |