Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Mein <mein@cs.umn.edu>2005-03-25 17:48:29 +0300
committerKent Mein <mein@cs.umn.edu>2005-03-25 17:48:29 +0300
commit57f72f4081953f0297404d128abb23065ae8489c (patch)
treed14779a0ec4f0dac7f6b522b06c058996e56dd71 /intern/moto
parentf49d7133d00634e90d858bfb2b4700f427da95f8 (diff)
Small fix for the following warning:
../include/MT_Quaternion.h:62: warning: declaration of 'angle' shadows a member of 'this' Kent
Diffstat (limited to 'intern/moto')
-rw-r--r--intern/moto/include/MT_Quaternion.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/moto/include/MT_Quaternion.h b/intern/moto/include/MT_Quaternion.h
index 03b52efe600..98046292982 100644
--- a/intern/moto/include/MT_Quaternion.h
+++ b/intern/moto/include/MT_Quaternion.h
@@ -59,19 +59,19 @@ public:
MT_Quaternion(const double v[4]) : MT_Vector4(v) {}
MT_Quaternion(MT_Scalar xx, MT_Scalar yy, MT_Scalar zz, MT_Scalar ww) :
MT_Vector4(xx, yy, zz, ww) {}
- MT_Quaternion(const MT_Vector3& axis, MT_Scalar angle) {
- setRotation(axis, angle);
+ MT_Quaternion(const MT_Vector3& axis, MT_Scalar mt_angle) {
+ setRotation(axis, mt_angle);
}
MT_Quaternion(MT_Scalar yaw, MT_Scalar pitch, MT_Scalar roll) {
setEuler(yaw, pitch, roll);
}
- void setRotation(const MT_Vector3& axis, MT_Scalar angle) {
+ void setRotation(const MT_Vector3& axis, MT_Scalar mt_angle) {
MT_Scalar d = axis.length();
MT_assert(!MT_fuzzyZero(d));
- MT_Scalar s = sin(angle * MT_Scalar(0.5)) / d;
+ MT_Scalar s = sin(mt_angle * MT_Scalar(0.5)) / d;
setValue(axis[0] * s, axis[1] * s, axis[2] * s,
- cos(angle * MT_Scalar(0.5)));
+ cos(mt_angle * MT_Scalar(0.5)));
}
void setEuler(MT_Scalar yaw, MT_Scalar pitch, MT_Scalar roll) {