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

__str__ functions for other mathutils types

Browse Source
This commit is contained in:
Campbell Barton
2011-12-20 03:37:55 +00:00
parent 32b23b9f74
commit 3d8ee28750
7 changed files with 98 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/python/mathutils/mathutils_Matrix.c
View File

@@ -1325,11 +1325,10 @@ static PyObject *Matrix_repr(MatrixObject *self)
static PyObject* Matrix_str(MatrixObject *self)
{
DynStr *ds;
char *ds_buf;
int ds_size;
int row, col, *maxsize;
PyObject *ret;
int maxsize[MATRIX_MAX_DIM];
int row, col;
char dummy_buf[1];
if (BaseMath_ReadCallback(self) == -1)
@@ -1337,8 +1336,6 @@ static PyObject* Matrix_str(MatrixObject *self)
ds= BLI_dynstr_new();
maxsize= PyMem_Malloc(self->row_size * sizeof(int));
/* First determine the maximum width for each column */
for (col = 0; col < self->row_size; col++) {
maxsize[col]= 0;
@@ -1358,15 +1355,7 @@ static PyObject* Matrix_str(MatrixObject *self)
}
BLI_dynstr_append(ds, " >");
ds_size= BLI_dynstr_get_len(ds) + 1; /* space for \n */
ds_buf= PyMem_Malloc(ds_size);
BLI_dynstr_get_cstring_ex(ds, ds_buf);
BLI_dynstr_free(ds);
PyMem_Free(maxsize);
ret= PyUnicode_FromStringAndSize(ds_buf, ds_size);
PyMem_Free(ds_buf);
return ret;
return mathutils_dynstr_to_py(ds); /* frees ds */
}
static PyObject* Matrix_richcmpr(PyObject *a, PyObject *b, int op)