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

[#22151] Modifier UI crash

Browse Source 
own error when editing context return values. r28401
This commit is contained in:
Campbell Barton
2010-04-25 19:56:43 +00:00
parent 873d4a3f05
commit 61eb217294
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2243,7 +2243,13 @@ static PyObject *pyrna_struct_getattro( BPy_StructRNA *self, PyObject *pyname )
if(done==1) { /* found */
switch(newtype) {
case CTX_DATA_TYPE_POINTER:
ret = pyrna_struct_CreatePyObject(&newptr); /* can return a bpy_struct or None */
if(newptr.data == NULL) {
ret= Py_None;
Py_INCREF(ret);
}
else {
ret= pyrna_struct_CreatePyObject(&newptr);
}
break;
case CTX_DATA_TYPE_COLLECTION:
{
@@ -3906,7 +3912,8 @@ static PyObject* pyrna_struct_Subtype(PointerRNA *ptr)
PyObject *pyrna_struct_CreatePyObject( PointerRNA *ptr )
{
BPy_StructRNA *pyrna= NULL;
/* note: don't rely on this to return None since NULL data with a valid type can often crash */
if (ptr->data==NULL && ptr->type==NULL) { /* Operator RNA has NULL data */
Py_RETURN_NONE;
}