[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28470] trunk/blender/source/blender/ python/generic/mathutils_matrix.c: oversight in recent mathutils update.

[Campbell Barton]

Revision: 28470
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28470
Author:   campbellbarton
Date:     2010-04-27 20:55:25 +0200 (Tue, 27 Apr 2010)

Log Message:
-----------
oversight in recent mathutils update. obj.matrix = obj.matrix would call its own updage callbacks until it crashed.

Modified Paths:
--------------
    trunk/blender/source/blender/python/generic/mathutils_matrix.c

Modified: trunk/blender/source/blender/python/generic/mathutils_matrix.c
===================================================================
--- trunk/blender/source/blender/python/generic/mathutils_matrix.c	2010-04-27 18:21:49 UTC (rev 28469)
+++ trunk/blender/source/blender/python/generic/mathutils_matrix.c	2010-04-27 18:55:25 UTC (rev 28470)
@@ -37,44 +37,44 @@
 /* matrix vector callbacks */
 int mathutils_matrix_vector_cb_index= -1;
 
-static int mathutils_matrix_vector_check(BaseMathObject *self_p)
+static int mathutils_matrix_vector_check(BaseMathObject *bmo)
 {
-	MatrixObject *self= (MatrixObject *)self_p;
+	MatrixObject *self= (MatrixObject *)bmo->cb_user;
 	return BaseMath_ReadCallback(self);
 }
 
-static int mathutils_matrix_vector_get(BaseMathObject *self_p, int subtype, float *vec_from)
+static int mathutils_matrix_vector_get(BaseMathObject *bmo, int subtype, float *vec_from)
 {
-	MatrixObject *self= (MatrixObject *)self_p;
+	MatrixObject *self= (MatrixObject *)bmo->cb_user;
 	int i;
 
 	if(!BaseMath_ReadCallback(self))
 		return 0;
 
-	for(i=0; i<self->colSize; i++)
+	for(i=0; i < self->colSize; i++)
 		vec_from[i]= self->matrix[subtype][i];
 
 	return 1;
 }
 
-static int mathutils_matrix_vector_set(BaseMathObject *self_p, int subtype, float *vec_to)
+static int mathutils_matrix_vector_set(BaseMathObject *bmo, int subtype, float *vec_to)
 {
-	MatrixObject *self= (MatrixObject *)self_p;
+	MatrixObject *self= (MatrixObject *)bmo->cb_user;
 	int i;
 
 	if(!BaseMath_ReadCallback(self))
 		return 0;
 
-	for(i=0; i<self->colSize; i++)
+	for(i=0; i < self->colSize; i++)
 		self->matrix[subtype][i]= vec_to[i];
 
 	BaseMath_WriteCallback(self);
 	return 1;
 }
 
-static int mathutils_matrix_vector_get_index(BaseMathObject *self_p, int subtype, float *vec_from, int index)
+static int mathutils_matrix_vector_get_index(BaseMathObject *bmo, int subtype, float *vec_from, int index)
 {
-	MatrixObject *self= (MatrixObject *)self_p;
+	MatrixObject *self= (MatrixObject *)bmo->cb_user;
 
 	if(!BaseMath_ReadCallback(self))
 		return 0;
@@ -83,9 +83,9 @@
 	return 1;
 }
 
-static int mathutils_matrix_vector_set_index(BaseMathObject *self_p, int subtype, float *vec_to, int index)
+static int mathutils_matrix_vector_set_index(BaseMathObject *bmo, int subtype, float *vec_to, int index)
 {
-	MatrixObject *self= (MatrixObject*)self_p;
+	MatrixObject *self= (MatrixObject *)bmo->cb_user;
 
 	if(!BaseMath_ReadCallback(self))
 		return 0;