sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

- bugfix (user supplied fix) [#20745] makesrna with rename error.

Browse Source 
- error with last commit, length had an index arg.
This commit is contained in:
Campbell Barton 2010-01-22 14:59:01 +00:00
parent c6979aa0f4
commit 3b09e73e58
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
release/scripts/modules/bpy/__init__.py
View File

@ -70,7 +70,6 @@ def load_scripts(reload_scripts=False):
reload(module) reload(module)
except: except:
traceback.print_exc() traceback.print_exc()
return None
if reload_scripts: if reload_scripts:
# reload modules that may not be directly included # reload modules that may not be directly included

3
source/blender/makesrna/intern/makesrna.c
View File

@ -51,12 +51,14 @@ static int replace_if_different(char *tmpfile)
{ {
#define REN_IF_DIFF \ #define REN_IF_DIFF \
remove(orgfile); \
if(rename(tmpfile, orgfile) != 0) { \ if(rename(tmpfile, orgfile) != 0) { \
fprintf(stderr, "%s:%d, rename error: \"%s\" -> \"%s\"\n", __FILE__, __LINE__, tmpfile, orgfile); \ fprintf(stderr, "%s:%d, rename error: \"%s\" -> \"%s\"\n", __FILE__, __LINE__, tmpfile, orgfile); \
return -1; \ return -1; \
} \ } \
remove(tmpfile); \ remove(tmpfile); \
return 1; \ return 1; \
/* end REN_IF_DIFF */
FILE *fp_new, *fp_org; FILE *fp_new, *fp_org;
@ -112,6 +114,7 @@ static int replace_if_different(char *tmpfile)
REN_IF_DIFF; REN_IF_DIFF;
} }
else { else {
remove(tmpfile);
return 0; return 0;
} }

2
source/blender/makesrna/intern/rna_rna.c
View File

@ -799,7 +799,7 @@ static void rna_BlenderRNA_structs_begin(CollectionPropertyIterator *iter, Point
} }
/* optional, for faster lookups */ /* 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); return BLI_countlist(&((BlenderRNA*)ptr->data)->structs);
} }