archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

recent commit missed swapping args for MATRIX_ITEM in mathutils_Vector.c, breaking matrix*vector.

Browse Source
This commit is contained in:
Campbell Barton
2011-12-20 11:37:55 +00:00
parent b70174cb93
commit ea88a0bec5
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/python/mathutils/mathutils_Vector.c
View File

@@ -1486,11 +1486,11 @@ static PyObject *Vector_isub(PyObject *v1, PyObject *v2)
* note: vector/matrix multiplication IS NOT COMMUTATIVE!!!! * note: vector/matrix multiplication IS NOT COMMUTATIVE!!!!
* note: assume read callbacks have been done first. * note: assume read callbacks have been done first.
*/ */
int column_vector_multiplication(float rvec[MAX_DIMENSIONS], VectorObject* vec, MatrixObject * mat) int column_vector_multiplication(float r_vec[MAX_DIMENSIONS], VectorObject* vec, MatrixObject * mat)
{ {
float vec_cpy[MAX_DIMENSIONS]; float vec_cpy[MAX_DIMENSIONS];
double dot = 0.0f; double dot = 0.0f;
int x, y, z = 0; int row, col, z = 0;
if (mat->num_col != vec->size) { if (mat->num_col != vec->size) {
if (mat->num_col == 4 && vec->size == 3) { if (mat->num_col == 4 && vec->size == 3) {
@@ -1507,13 +1507,13 @@ int column_vector_multiplication(float rvec[MAX_DIMENSIONS], VectorObject* vec,
memcpy(vec_cpy, vec->vec, vec->size * sizeof(float)); memcpy(vec_cpy, vec->vec, vec->size * sizeof(float));
rvec[3] = 1.0f; r_vec[3] = 1.0f;
for (x = 0; x < mat->num_row; x++) { for (row = 0; row < mat->num_row; row++) {
for (y = 0; y < mat->num_col; y++) { for (col = 0; col < mat->num_col; col++) {
dot += (double)(MATRIX_ITEM(mat, y, x) * vec_cpy[y]); dot += (double)(MATRIX_ITEM(mat, row, col) * vec_cpy[col]);
} }
rvec[z++] = (float)dot; r_vec[z++] = (float)dot;
dot = 0.0f; dot = 0.0f;
} }
@@ -2634,7 +2634,7 @@ static int row_vector_multiplication(float rvec[MAX_DIMENSIONS], VectorObject *v
//muliplication //muliplication
for (x = 0; x < mat->num_col; x++) { for (x = 0; x < mat->num_col; x++) {
for (y = 0; y < mat->num_row; y++) { for (y = 0; y < mat->num_row; y++) {
dot += MATRIX_ITEM(mat, x, y) * vec_cpy[y]; dot += MATRIX_ITEM(mat, y, x) * vec_cpy[y];
} }
rvec[z++] = (float)dot; rvec[z++] = (float)dot;
dot = 0.0f; dot = 0.0f;