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

modified patch from Arystanbek, allow assigning of mathutils matrix to an rna matrix

Browse Source
This commit is contained in:
Campbell Barton
2009-06-23 17:10:46 +00:00
parent af3f862480
commit dd493f71be
1 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source/blender/python/intern/bpy_rna.c
View File

@@ -410,14 +410,29 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
if (len > 0) { if (len > 0) {
PyObject *item; PyObject *item;
int py_len = -1;
int i; int i;
if (!PySequence_Check(value)) {
#ifdef USE_MATHUTILS
if(MatrixObject_Check(value)) {
MatrixObject *mat = (MatrixObject*)value;
if(!Matrix_ReadCallback(mat))
return -1;
py_len = mat->rowSize * mat->colSize;
} else // continue...
#endif
if (PySequence_Check(value)) {
py_len= (int)PySequence_Length(value);
}
else {
PyErr_SetString(PyExc_TypeError, "expected a python sequence type assigned to an RNA array."); PyErr_SetString(PyExc_TypeError, "expected a python sequence type assigned to an RNA array.");
return -1; return -1;
} }
/* done getting the length */
if ((int)PySequence_Length(value) != len) { if (py_len != len) {
PyErr_SetString(PyExc_AttributeError, "python sequence length did not match the RNA array."); PyErr_SetString(PyExc_AttributeError, "python sequence length did not match the RNA array.");
return -1; return -1;
} }
@@ -484,14 +499,21 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
else param_arr = MEM_mallocN(sizeof(float) * len, "pyrna float array"); else param_arr = MEM_mallocN(sizeof(float) * len, "pyrna float array");
#ifdef USE_MATHUTILS
/* collect the variables */ if(MatrixObject_Check(value) && RNA_property_subtype(prop) == PROP_MATRIX) {
for (i=0; i<len; i++) { MatrixObject *mat = (MatrixObject*)value;
item = PySequence_GetItem(value, i); memcpy(param_arr, mat->contigPtr, sizeof(float) * len);
param_arr[i] = (float)PyFloat_AsDouble(item); /* deal with any errors later */ } else // continue...
Py_DECREF(item); #endif
{
/* collect the variables */
for (i=0; i<len; i++) {
item = PySequence_GetItem(value, i);
param_arr[i] = (float)PyFloat_AsDouble(item); /* deal with any errors later */
Py_DECREF(item);
}
} }
if (PyErr_Occurred()) { if (PyErr_Occurred()) {
if(data==NULL) if(data==NULL)
MEM_freeN(param_arr); MEM_freeN(param_arr);