[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38554] trunk/blender/source/blender/ python/mathutils/mathutils_Matrix.c: revert recent matrix multiplication patch:

[Campbell Barton]

Revision: 38554
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38554
Author:   campbellbarton
Date:     2011-07-21 02:00:29 +0000 (Thu, 21 Jul 2011)
Log Message:
-----------
revert recent matrix multiplication patch:
 [#28032] Python Mathutils: Matrix Multiplication Error

Since they ended up reversing the order we better keep old code unless its proven to be incorrect.
also change Matrix.__repr__ function args to evaluate correctly (need to be inside a tuple).

Modified Paths:
--------------
    trunk/blender/source/blender/python/mathutils/mathutils_Matrix.c

Modified: trunk/blender/source/blender/python/mathutils/mathutils_Matrix.c
===================================================================
--- trunk/blender/source/blender/python/mathutils/mathutils_Matrix.c	2011-07-21 01:37:15 UTC (rev 38553)
+++ trunk/blender/source/blender/python/mathutils/mathutils_Matrix.c	2011-07-21 02:00:29 UTC (rev 38554)
@@ -1318,21 +1318,20 @@
 		}
 	}
 	switch(self->row_size) {
-	case 2:	return PyUnicode_FromFormat("Matrix(%R,\n"
-										"       %R)", rows[0], rows[1]);
+	case 2:	return PyUnicode_FromFormat("Matrix((%R,\n"
+										"        %R))", rows[0], rows[1]);
 
-	case 3:	return PyUnicode_FromFormat("Matrix(%R,\n"
-										"       %R,\n"
-										"       %R)", rows[0], rows[1], rows[2]);
+	case 3:	return PyUnicode_FromFormat("Matrix((%R,\n"
+										"        %R,\n"
+										"        %R))", rows[0], rows[1], rows[2]);
 
-	case 4:	return PyUnicode_FromFormat("Matrix(%R,\n"
-										"       %R,\n"
-										"       %R,\n"
-										"       %R)", rows[0], rows[1], rows[2], rows[3]);
+	case 4:	return PyUnicode_FromFormat("Matrix((%R,\n"
+										"        %R,\n"
+										"        %R,\n"
+										"        %R))", rows[0], rows[1], rows[2], rows[3]);
 	}
 
-	PyErr_SetString(PyExc_RuntimeError,
-	                "internal error!");
+	Py_FatalError("Matrix(): invalid row size!");
 	return NULL;
 }
 
@@ -1587,26 +1586,24 @@
 
 	if(mat1 && mat2) {
 		/*MATRIX * MATRIX*/
-		if(mat2->row_size != mat1->col_size){
-			PyErr_SetString(PyExc_ValueError,
-			                "Matrix multiplication: "
-			                "matrix A rowsize must equal matrix B colsize");
-			return NULL;
-		}
-		else {
-			float mat[16]= {0.0f};
-			int x, y, z;
+		float mat[16]= {0.0f, 0.0f, 0.0f, 0.0f,
+						0.0f, 0.0f, 0.0f, 0.0f,
+						0.0f, 0.0f, 0.0f, 0.0f,
+						0.0f, 0.0f, 0.0f, 1.0f};
+		double dot = 0.0f;
+		int x, y, z;
 
-			for(x = 0; x < mat2->row_size; x++) {
-				for(y = 0; y < mat1->col_size; y++) {
-					for(z = 0; z < mat1->row_size; z++) {
-						mat[x * mat2->col_size + y] += (mat2->matrix[x][z] * mat1->matrix[z][y]);
-					}
+		for(x = 0; x < mat2->row_size; x++) {
+			for(y = 0; y < mat1->col_size; y++) {
+				for(z = 0; z < mat1->row_size; z++) {
+					dot += (mat1->matrix[z][y] * mat2->matrix[x][z]);
 				}
+				mat[((x * mat1->col_size) + y)] = (float)dot;
+				dot = 0.0f;
 			}
-
-			return newMatrixObject(mat, mat1->row_size, mat2->col_size, Py_NEW, Py_TYPE(mat1));
 		}
+
+		return newMatrixObject(mat, mat2->row_size, mat1->col_size, Py_NEW, Py_TYPE(mat1));
 	}
 	else if(mat2) {
 		/*FLOAT/INT * MATRIX */