[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26195] trunk/blender: - bugfix ( user supplied fix) [#20745] makesrna with rename error.

[Campbell Barton]

Revision: 26195
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26195
Author:   campbellbarton
Date:     2010-01-22 15:59:01 +0100 (Fri, 22 Jan 2010)

Log Message:
-----------
- bugfix (user supplied fix) [#20745] makesrna with rename error.
- error with last commit, length had an index arg.

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/bpy/__init__.py
    trunk/blender/source/blender/makesrna/intern/makesrna.c
    trunk/blender/source/blender/makesrna/intern/rna_rna.c

Modified: trunk/blender/release/scripts/modules/bpy/__init__.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/__init__.py	2010-01-22 14:43:08 UTC (rev 26194)
+++ trunk/blender/release/scripts/modules/bpy/__init__.py	2010-01-22 14:59:01 UTC (rev 26195)
@@ -70,7 +70,6 @@
             reload(module)
         except:
             traceback.print_exc()
-            return None
 
     if reload_scripts:
         # reload modules that may not be directly included

Modified: trunk/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/makesrna.c	2010-01-22 14:43:08 UTC (rev 26194)
+++ trunk/blender/source/blender/makesrna/intern/makesrna.c	2010-01-22 14:59:01 UTC (rev 26195)
@@ -51,12 +51,14 @@
 {
 
 #define REN_IF_DIFF \
+	remove(orgfile); \
 	if(rename(tmpfile, orgfile) != 0) { \
 		fprintf(stderr, "%s:%d, rename error: \"%s\" -> \"%s\"\n", __FILE__, __LINE__, tmpfile, orgfile); \
 		return -1; \
 	} \
 	remove(tmpfile); \
 	return 1; \
+/* end REN_IF_DIFF */
 
 
 	FILE *fp_new, *fp_org;
@@ -112,6 +114,7 @@
 		REN_IF_DIFF;
 	}
 	else {
+		remove(tmpfile);
 		return 0;
 	}
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_rna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_rna.c	2010-01-22 14:43:08 UTC (rev 26194)
+++ trunk/blender/source/blender/makesrna/intern/rna_rna.c	2010-01-22 14:59:01 UTC (rev 26195)
@@ -799,7 +799,7 @@
 }
 
 /* optional, for faster lookups */
-static int rna_BlenderRNA_structs_length(PointerRNA *ptr, int index)
+static int rna_BlenderRNA_structs_length(PointerRNA *ptr)
 {
 	return BLI_countlist(&((BlenderRNA*)ptr->data)->structs);
 }