diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-07-30 17:18:04 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-07-30 17:18:04 +0400 |
commit | d163ce55953bd04b42c2c79f6729e47228c01a9a (patch) | |
tree | c5a5a386b1c31a2b19cb218722950f3c0ef9dddd /source/blender/python/intern | |
parent | 681b26a48ef5f83c2f0941707324b76d57c77f68 (diff) |
bpy fix for crash/assert on running dir() on a non collection property + some other minor corrections.
Diffstat (limited to 'source/blender/python/intern')
-rw-r--r-- | source/blender/python/intern/bpy_rna.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 6e1b9c807f3..2dcfe3731c7 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -3262,11 +3262,15 @@ static PyObject *pyrna_prop_dir(BPy_PropertyRNA *self) * */ ret= PyList_New(0); - if (!BPy_PropertyRNA_CheckExact(self)) + if (!BPy_PropertyRNA_CheckExact(self)) { pyrna_dir_members_py(ret, (PyObject *)self); + } - if(RNA_property_collection_type_get(&self->ptr, self->prop, &r_ptr)) - pyrna_dir_members_rna(ret, &r_ptr); + if(RNA_property_type(self->prop) == PROP_COLLECTION) { + if(RNA_property_collection_type_get(&self->ptr, self->prop, &r_ptr)) { + pyrna_dir_members_rna(ret, &r_ptr); + } + } return ret; } |