diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-05-20 13:17:21 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-05-20 13:17:21 +0400 |
commit | d80911b8675582dca46ce78c17d5434b66a27f18 (patch) | |
tree | dcb1c32f10273f99fa2e3872f654387fabd27c7d /source | |
parent | a1cc5ef8eb5ff4c2991199d286e572f1b6eaf4c6 (diff) |
RNA: ID properties were not being shown as RNA properties anymore, fixed.
Python: fix two warnings (initialize to NULL).
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/makesrna/RNA_types.h | 1 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_rna.c | 7 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_operator_wrap.c | 2 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_rna.c | 1 |
4 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h index 69d9a6db7ce..0a8836327c3 100644 --- a/source/blender/makesrna/RNA_types.h +++ b/source/blender/makesrna/RNA_types.h @@ -109,6 +109,7 @@ typedef enum PropertyFlag { typedef struct CollectionPropertyIterator { /* internal */ PointerRNA parent; + PointerRNA builtin_parent; struct PropertyRNA *prop; void *internal; int idprop; diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c index f7039d9c756..f52e27686bb 100644 --- a/source/blender/makesrna/intern/rna_rna.c +++ b/source/blender/makesrna/intern/rna_rna.c @@ -87,7 +87,7 @@ static int rna_idproperty_known(CollectionPropertyIterator *iter, void *data) { IDProperty *idprop= (IDProperty*)data; PropertyRNA *prop; - StructRNA *ptype= iter->parent.type; + StructRNA *ptype= iter->builtin_parent.type; /* function to skip any id properties that are already known by RNA, * for the second loop where we go over unknown id properties */ @@ -177,7 +177,7 @@ static void rna_Struct_properties_next(CollectionPropertyIterator *iter) /* try id properties */ if(!iter->valid) { - group= rna_idproperties_get(&iter->parent, 0); + group= rna_idproperties_get(&iter->builtin_parent, 0); if(group) { rna_iterator_listbase_end(iter); @@ -243,7 +243,7 @@ static PointerRNA rna_Struct_functions_get(CollectionPropertyIterator *iter) } /* Builtin properties iterator re-uses the Struct properties iterator, only - * difference is that we need to see the ptr data to the type of the struct + * difference is that we need to set the ptr data to the type of the struct * whose properties we want to iterate over. */ void rna_builtin_properties_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) @@ -260,6 +260,7 @@ void rna_builtin_properties_begin(CollectionPropertyIterator *iter, PointerRNA * newptr.id.data= NULL; iter->parent= newptr; + iter->builtin_parent = *ptr; rna_Struct_properties_begin(iter, &newptr); } diff --git a/source/blender/python/intern/bpy_operator_wrap.c b/source/blender/python/intern/bpy_operator_wrap.c index 4fa72fe18bc..43d62b3005f 100644 --- a/source/blender/python/intern/bpy_operator_wrap.c +++ b/source/blender/python/intern/bpy_operator_wrap.c @@ -187,7 +187,7 @@ static int PYTHON_OT_generic(int mode, bContext *C, wmOperator *op, wmEvent *eve { PyObject *py_class = op->type->pyop_data; PyObject *args; - PyObject *ret= NULL, *py_class_instance, *item; + PyObject *ret= NULL, *py_class_instance, *item= NULL; int ret_flag= (mode==PYOP_POLL ? 0:OPERATOR_CANCELLED); PyGILState_STATE gilstate = PyGILState_Ensure(); diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 3274a2ba284..f1aa5e8fdfe 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -1092,6 +1092,7 @@ PyObject *pyrna_param_to_py(PointerRNA *ptr, PropertyRNA *prop, void *data) case PROP_COLLECTION: /* XXX not supported yet * ret = pyrna_prop_CreatePyObject(ptr, prop); */ + ret = NULL; break; default: PyErr_Format(PyExc_AttributeError, "RNA Error: unknown type \"%d\" (pyrna_param_to_py)", type); |