summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorleo2005-10-10 21:17:03 +0000
committerleo2005-10-10 21:17:03 +0000
commite628ac83ce745362b4e1bb719cc2db0a1ce74a76 (patch)
tree76f773007c0131957d3dea3fb2d2dbce62296870
parent6540f25919e97cbb426ac16db3f1114ad61e0df8 (diff)
Fixed a gcc compiler error.
git-svn-id: http://svn.leocad.org/trunk@426 c7d43263-9d01-0410-8a33-9dba5d9f93d6
-rw-r--r--common/matrix.cpp4
-rw-r--r--common/matrix.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/common/matrix.cpp b/common/matrix.cpp
index e69e870..8f19cbd 100644
--- a/common/matrix.cpp
+++ b/common/matrix.cpp
@@ -205,9 +205,9 @@ void Matrix::LoadIdentity ()
memcpy (&m[0], &Identity, sizeof(float[16]));
}
-void Matrix::Multiply (Matrix& m1, Matrix& m2)
+void Matrix::Multiply(const Matrix& m1, const Matrix& m2)
{
- matmul (m, m1.m, m2.m);
+ matmul(m, m1.m, m2.m);
}
void Matrix::Rotate (float angle, float x, float y, float z)
diff --git a/common/matrix.h b/common/matrix.h
index 733f16b..910cc78 100644
--- a/common/matrix.h
+++ b/common/matrix.h
@@ -30,7 +30,7 @@ class Matrix
void LoadIdentity();
void Translate(float x, float y, float z);
- void Multiply(Matrix& m1, Matrix& m2);
+ void Multiply(const Matrix& m1, const Matrix& m2);
bool Invert();
void Transpose3();