From 4a747bebf456f57f5011fb3ee467c5a486ddf7a1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 14 Mar 2011 05:39:07 +0000 Subject: [PATCH] fix [#26489] Auto completion in console broken own mistake in r35492. --- source/blender/python/intern/bpy_rna.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index aa657f34f39..a06d44c7e27 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -3141,13 +3141,16 @@ static PyObject *pyrna_prop_collection_getattro(BPy_PropertyRNA *self, PyObject if(ret == NULL) { /* since this is least common case, handle it last */ PointerRNA r_ptr; - PyObject *error_type, *error_value, *error_traceback; - PyErr_Fetch(&error_type, &error_value, &error_traceback); - PyErr_Clear(); - if(RNA_property_collection_type_get(&self->ptr, self->prop, &r_ptr)) { - PyObject *cls= pyrna_struct_Subtype(&r_ptr); /* borrows */ + PyObject *cls; + + PyObject *error_type, *error_value, *error_traceback; + PyErr_Fetch(&error_type, &error_value, &error_traceback); + PyErr_Clear(); + + cls= pyrna_struct_Subtype(&r_ptr); /* borrows */ ret= PyObject_GenericGetAttr(cls, pyname); + /* restore the original error */ if(ret == NULL) { PyErr_Restore(error_type, error_value, error_traceback); }