- pyrna support for (value in array), currently only 1 dimensional arrays.

- use python malloc's in bpy_array.c
- automatically blending bone locations is disabled if the target bone has locked location
- neck had incorrect roll
This commit is contained in:
2009-12-08 09:40:30 +00:00
parent c146ce977c
commit fccceaa87f
5 changed files with 119 additions and 21 deletions

View File

@@ -1167,22 +1167,29 @@ static PyMappingMethods pyrna_prop_as_mapping = {
static int pyrna_prop_contains(BPy_PropertyRNA *self, PyObject *value)
{
PointerRNA newptr; /* not used, just so RNA_property_collection_lookup_string runs */
char *keyname = _PyUnicode_AsString(value);
if(keyname==NULL) {
PyErr_SetString(PyExc_TypeError, "PropertyRNA - key in prop, key must be a string type");
if (RNA_property_type(self->prop) == PROP_COLLECTION) {
/* key in dict style check */
char *keyname = _PyUnicode_AsString(value);
if(keyname==NULL) {
PyErr_SetString(PyExc_TypeError, "PropertyRNA - key in prop, key must be a string type");
return -1;
}
if (RNA_property_collection_lookup_string(&self->ptr, self->prop, keyname, &newptr))
return 1;
}
else if (RNA_property_array_check(&self->ptr, self->prop)) {
/* value in list style check */
return pyrna_array_contains_py(&self->ptr, self->prop, value);
}
else {
PyErr_SetString(PyExc_TypeError, "PropertyRNA - type is not an array or a collection");
return -1;
}
if (RNA_property_type(self->prop) != PROP_COLLECTION) {
PyErr_SetString(PyExc_TypeError, "PropertyRNA - key in prop, is only valid for collection types");
return -1;
}
if (RNA_property_collection_lookup_string(&self->ptr, self->prop, keyname, &newptr))
return 1;
return 0;
}
@@ -2264,6 +2271,9 @@ static PyObject *foreach_getset(BPy_PropertyRNA *self, PyObject *args, int set)
}
}
if(array)
PyMem_Free(array);
if(PyErr_Occurred()) {
/* Maybe we could make our own error */
PyErr_Print();
@@ -2275,9 +2285,6 @@ static PyObject *foreach_getset(BPy_PropertyRNA *self, PyObject *args, int set)
return NULL;
}
if(array)
PyMem_Free(array);
Py_RETURN_NONE;
}