[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45537] trunk/blender/source/blender/ python/intern/bpy_rna.c: py rna/api: fix for error running RNA_property_collection_type_get on non collection property types .
Campbell Barton
ideasman42 at gmail.com
Wed Apr 11 12:35:10 CEST 2012
Revision: 45537
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45537
Author: campbellbarton
Date: 2012-04-11 10:35:09 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
py rna/api: fix for error running RNA_property_collection_type_get on non collection property types.
Modified Paths:
--------------
trunk/blender/source/blender/python/intern/bpy_rna.c
Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c 2012-04-11 09:07:28 UTC (rev 45536)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c 2012-04-11 10:35:09 UTC (rev 45537)
@@ -3324,13 +3324,15 @@
/* since this is least common case, handle it last */
if (BPy_PropertyRNA_Check(self)) {
BPy_PropertyRNA *self_prop = (BPy_PropertyRNA *)self;
- PointerRNA r_ptr;
+ if (RNA_property_type(self_prop->prop) == PROP_COLLECTION) {
+ PointerRNA r_ptr;
- if (RNA_property_collection_type_get(&self_prop->ptr, self_prop->prop, &r_ptr)) {
- PyObject *cls = pyrna_struct_Subtype(&r_ptr); /* borrows */
- dict = ((PyTypeObject *)cls)->tp_dict;
- pyrna_dir_members_py__add_keys(list, dict);
- Py_DECREF(cls);
+ if (RNA_property_collection_type_get(&self_prop->ptr, self_prop->prop, &r_ptr)) {
+ PyObject *cls = pyrna_struct_Subtype(&r_ptr); /* borrows */
+ dict = ((PyTypeObject *)cls)->tp_dict;
+ pyrna_dir_members_py__add_keys(list, dict);
+ Py_DECREF(cls);
+ }
}
}
}
More information about the Bf-blender-cvs
mailing list