[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25670] trunk/blender/source/blender/ python: fix for mistake in last commit.

Campbell Barton ideasman42 at gmail.com
Sat Jan 2 20:01:19 CET 2010


Revision: 25670
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25670
Author:   campbellbarton
Date:     2010-01-02 20:01:19 +0100 (Sat, 02 Jan 2010)

Log Message:
-----------
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)

Modified Paths:
--------------
    trunk/blender/source/blender/python/intern/bpy_rna.c
    trunk/blender/source/blender/python/sphinx_doc_gen.py

Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c	2010-01-02 18:55:07 UTC (rev 25669)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c	2010-01-02 19:01:19 UTC (rev 25670)
@@ -2715,6 +2715,7 @@
 	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 @@
 			break;
 		}
 	}
+	
+	RNA_parameter_list_end(&iter);
 
 
 	/* Check if we gave args that dont exist in the function
@@ -4194,6 +4197,7 @@
 
 			ret = PyObject_Call(item, args, NULL);
 
+			RNA_parameter_list_end(&iter);
 			Py_DECREF(item);
 			Py_DECREF(args);
 		}
@@ -4242,6 +4246,8 @@
 							break;
 					}
 				}
+
+				RNA_parameter_list_end(&iter);
 			}
 		}
 		Py_DECREF(ret);

Modified: trunk/blender/source/blender/python/sphinx_doc_gen.py
===================================================================
--- trunk/blender/source/blender/python/sphinx_doc_gen.py	2010-01-02 18:55:07 UTC (rev 25669)
+++ trunk/blender/source/blender/python/sphinx_doc_gen.py	2010-01-02 19:01:19 UTC (rev 25670)
@@ -115,8 +115,8 @@
         #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")





More information about the Bf-blender-cvs mailing list