fix for mistake in last commit. also forgot to call RNA_parameter_list_end() in some places, (ok the function does nothing now, but some day it might do)

2 files changed, 8 insertions, 2 deletions

diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index 14177220a94..a95a5dd1783 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -2715,6 +2715,7 @@ static PyObject * pyrna_func_call(PyObject *self, PyObject *args, PyObject *kw)
 	ret_len= 0;
 
 	if(args_len + (kw ? PyDict_Size(kw):0) > parms_len) {
+		RNA_parameter_list_end(&iter);
 		PyErr_Format(PyExc_TypeError, "%.200s.%.200s(): takes at most %d arguments, got %d", RNA_struct_identifier(self_ptr->type), RNA_function_identifier(self_func), parms_len, args_len);
 		err= -1;
 	}
@@ -2780,6 +2781,8 @@ static PyObject * pyrna_func_call(PyObject *self, PyObject *args, PyObject *kw)
 			break;
 		}
 	}
+	
+	RNA_parameter_list_end(&iter);
 
 
 	/* Check if we gave args that dont exist in the function
@@ -4194,6 +4197,7 @@ static int bpy_class_call(PointerRNA *ptr, FunctionRNA *func, ParameterList *par
 
 			ret = PyObject_Call(item, args, NULL);
 
+			RNA_parameter_list_end(&iter);
 			Py_DECREF(item);
 			Py_DECREF(args);
 		}
@@ -4242,6 +4246,8 @@ static int bpy_class_call(PointerRNA *ptr, FunctionRNA *func, ParameterList *par
 							break;
 					}
 				}
+
+				RNA_parameter_list_end(&iter);
 			}
 		}
 		Py_DECREF(ret);
diff --git a/source/blender/python/sphinx_doc_gen.py b/source/blender/python/sphinx_doc_gen.py
index 73ac95ff931..df48bad980d 100644
--- a/source/blender/python/sphinx_doc_gen.py
+++ b/source/blender/python/sphinx_doc_gen.py
@@ -115,8 +115,8 @@ def rna2sphinx(BASEPATH):
         #if not struct.identifier.startswith("Sc") and not struct.identifier.startswith("I"):
         #    return
 
-        if not struct.identifier == "Object":
-            return
+        #if not struct.identifier == "Object":
+        #    return
 
         filepath = os.path.join(BASEPATH, "bpy.types.%s.rst" % struct.identifier)
         file = open(filepath, "w")