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

py api: fix for context returning None for an empty list such as 'context.selected_objects', now returns []

Browse Source
This commit is contained in:
Campbell Barton
2010-04-24 19:26:05 +00:00
parent b31e9b764e
commit 4bd3163ea6
6 changed files with 55 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2236,28 +2236,29 @@ static PyObject *pyrna_struct_getattro( BPy_StructRNA *self, PyObject *pyname )
else {
PointerRNA newptr;
ListBase newlb;
short newtype;
int done= CTX_data_get(C, name, &newptr, &newlb);
int done= CTX_data_get(C, name, &newptr, &newlb, &newtype);
if(done==1) { /* found */
if (newptr.data) {
ret = pyrna_struct_CreatePyObject(&newptr);
}
else if (newlb.first) {
CollectionPointerLink *link;
PyObject *linkptr;
ret = PyList_New(0);
for(link=newlb.first; link; link=link->next) {
linkptr= pyrna_struct_CreatePyObject(&link->ptr);
PyList_Append(ret, linkptr);
Py_DECREF(linkptr);
switch(newtype) {
case CTX_DATA_TYPE_POINTER:
ret = pyrna_struct_CreatePyObject(&newptr); /* can return a bpy_struct or None */
break;
case CTX_DATA_TYPE_COLLECTION:
{
CollectionPointerLink *link;
PyObject *linkptr;
ret = PyList_New(0);
for(link=newlb.first; link; link=link->next) {
linkptr= pyrna_struct_CreatePyObject(&link->ptr);
PyList_Append(ret, linkptr);
Py_DECREF(linkptr);
}
}
}
else {
ret = Py_None;
Py_INCREF(ret);
break;
}
}
else if (done==-1) { /* found but not set */