diff options
| -rw-r--r-- | intern/iksolver/intern/TNT/svd.h | 12 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/freetypefont.c | 2 | ||||
| -rw-r--r-- | source/blender/src/header_image.c | 1 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_MouseFocusSensor.h | 3 |
4 files changed, 9 insertions, 9 deletions
diff --git a/intern/iksolver/intern/TNT/svd.h b/intern/iksolver/intern/TNT/svd.h index 1b25361811e..af281d0fce0 100644 --- a/intern/iksolver/intern/TNT/svd.h +++ b/intern/iksolver/intern/TNT/svd.h @@ -232,7 +232,7 @@ void SVD(MaTRiX &A, MaTRiX &U, VecToR &s, MaTRiX &V, VecToR &work1, VecToR &work if (k == -1) { break; } - if (abs(e[k]) <= eps*(abs(s[k]) + abs(s[k+1]))) { + if (TNT::abs(e[k]) <= eps*(TNT::abs(s[k]) + TNT::abs(s[k+1]))) { e[k] = 0.0; break; } @@ -245,9 +245,9 @@ void SVD(MaTRiX &A, MaTRiX &U, VecToR &s, MaTRiX &V, VecToR &work1, VecToR &work if (ks == k) { break; } - typename MaTRiX::value_type t = (ks != p ? abs(e[ks]) : 0.) + - (ks != k+1 ? abs(e[ks-1]) : 0.); - if (abs(s[ks]) <= eps*t) { + typename MaTRiX::value_type t = (ks != p ? TNT::abs(e[ks]) : 0.) + + (ks != k+1 ? TNT::abs(e[ks-1]) : 0.); + if (TNT::abs(s[ks]) <= eps*t) { s[ks] = 0.0; break; } @@ -320,8 +320,8 @@ void SVD(MaTRiX &A, MaTRiX &U, VecToR &s, MaTRiX &V, VecToR &work1, VecToR &work // Calculate the shift. typename MaTRiX::value_type scale = max(max(max(max( - abs(s[p-1]),abs(s[p-2])),abs(e[p-2])), - abs(s[k])),abs(e[k])); + TNT::abs(s[p-1]),TNT::abs(s[p-2])),TNT::abs(e[p-2])), + TNT::abs(s[k])),TNT::abs(e[k])); typename MaTRiX::value_type sp = s[p-1]/scale; typename MaTRiX::value_type spm1 = s[p-2]/scale; typename MaTRiX::value_type epm1 = e[p-2]/scale; diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c index f20be8ce828..577309a5474 100644 --- a/source/blender/blenlib/intern/freetypefont.c +++ b/source/blender/blenlib/intern/freetypefont.c @@ -413,7 +413,7 @@ static VFontData *objfnt_to_ftvfontdata(PackedFile * pf) lcode = charcode; } - err = FT_Set_Charmap( face, FT_ENCODING_UNICODE ); + err = FT_Set_Charmap( face, (FT_CharMap) FT_ENCODING_UNICODE ); return vfd; } diff --git a/source/blender/src/header_image.c b/source/blender/src/header_image.c index 1d6593d0792..55f4b640bc7 100644 --- a/source/blender/src/header_image.c +++ b/source/blender/src/header_image.c @@ -56,6 +56,7 @@ #include "BDR_unwrapper.h" #include "BKE_global.h" #include "BKE_image.h" +#include "BKE_library.h" #include "BKE_main.h" #include "BKE_packedFile.h" #include "BKE_utildefines.h" diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.h b/source/gameengine/Ketsji/KX_MouseFocusSensor.h index 85ff0b83df6..cf7af709c48 100644 --- a/source/gameengine/Ketsji/KX_MouseFocusSensor.h +++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.h @@ -95,6 +95,7 @@ class KX_MouseFocusSensor : public SCA_MouseSensor KX_PYMETHOD_DOC(KX_MouseFocusSensor,GetRayDirection); /* --------------------------------------------------------------------- */ + SCA_IObject* m_hitObject; private: /** @@ -138,8 +139,6 @@ class KX_MouseFocusSensor : public SCA_MouseSensor * the object was hit. */ MT_Vector3 m_hitNormal; - SCA_IObject* m_hitObject; - /** * Ref to the engine, for retrieving a reference to the current |