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

exceptions in registering properties were not properly handled, allowing a single error stop the main module registration loop.

Browse Source 
worst case 1 script error could load blender without a UI.
This commit is contained in:
Campbell Barton
2010-12-13 07:54:35 +00:00
parent 39e3a75978
commit 6ef85af300
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4908,7 +4908,7 @@ static int pyrna_deferred_register_props(StructRNA *srna, PyObject *class_dict)
PyObject *item, *key;
PyObject *order;
Py_ssize_t pos = 0;
int ret;
int ret= 0;
/* in both cases PyDict_CheckExact(class_dict) will be true even
* though Operators have a metaclass dict namespace */
@@ -4918,7 +4918,7 @@ static int pyrna_deferred_register_props(StructRNA *srna, PyObject *class_dict)
key= PyList_GET_ITEM(order, pos);
item= PyDict_GetItem(class_dict, key);
ret= deferred_register_prop(srna, key, item);
if(ret==-1)
if(ret != 0)
break;
}
}
@@ -4926,12 +4926,12 @@ static int pyrna_deferred_register_props(StructRNA *srna, PyObject *class_dict)
while (PyDict_Next(class_dict, &pos, &key, &item)) {
ret= deferred_register_prop(srna, key, item);
if(ret==-1)
if(ret != 0)
break;
}
}
return 0;
return ret;
}
static int pyrna_deferred_register_class_recursive(StructRNA *srna, PyTypeObject *py_class)