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

fix [#30906] dict(prop) crashes if prop is a PropertyGroup with nested PropertyGroup

Browse Source 
the ID of a python ID property can be NULL.
This commit is contained in:
Campbell Barton
2012-04-11 08:37:48 +00:00
parent e5579ac505
commit 85908b498b
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/python/generic/idprop_py_api.c
View File

@@ -134,7 +134,8 @@ static Py_hash_t BPy_IDGroup_hash(BPy_IDProperty *self)
static PyObject *BPy_IDGroup_repr(BPy_IDProperty *self)
{
return PyUnicode_FromFormat("<bpy id property from \"%s\">", self->id->name);
return PyUnicode_FromFormat("<bpy id prop: owner=\"%s\", name=\"%s\", address=%p>",
self->id ? self->id->name : "<NONE>", self->prop->name, self->prop);
}
PyObject *BPy_IDGroup_WrapData(ID *id, IDProperty *prop, IDProperty *parent)

4
source/blender/python/generic/idprop_py_api.h
View File

@@ -34,7 +34,7 @@ struct BPy_IDGroup_Iter;
typedef struct BPy_IDProperty {
PyObject_VAR_HEAD
struct ID *id;
struct ID *id; /* can be NULL */
struct IDProperty *prop; /* must be second member */
struct IDProperty *parent;
PyObject *data_wrap;
@@ -42,7 +42,7 @@ typedef struct BPy_IDProperty {
typedef struct BPy_IDArray {
PyObject_VAR_HEAD
struct ID *id;
struct ID *id; /* can be NULL */
struct IDProperty *prop; /* must be second member */
} BPy_IDArray;