diff options
author | Daniel Dunbar <daniel@zuster.org> | 2005-07-21 06:56:45 +0400 |
---|---|---|
committer | Daniel Dunbar <daniel@zuster.org> | 2005-07-21 06:56:45 +0400 |
commit | 15f6ce46b152de3068f4203448ea3550fe732487 (patch) | |
tree | dc2a38c3a8d2b37b9027ea8dea0001d6d74a2c25 /source/blender/makesdna/intern/makesdna.c | |
parent | e51f93b76cd752fe145905b23ce6fee6caa96950 (diff) |
- apologies, made stupid newbie error in makesdna change (I'm blushing),
which majorly borked DNA and meant crashes everywhere. (C pointer
arith, you know)
Diffstat (limited to 'source/blender/makesdna/intern/makesdna.c')
-rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index bb87347374f..3db54336060 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -942,7 +942,7 @@ int make_structDNA(char *baseDirectory, FILE *file) /* calculate size of datablock with strings */ cp= names[nr_names-1]; cp+= strlen(names[nr_names-1]) + 1; /* +1: null-terminator */ - len= (long) (cp - names[0]); + len= (long) (cp - (char*) names[0]); len= (len+3) & ~3; dna_write(file, names[0], len); @@ -955,7 +955,7 @@ int make_structDNA(char *baseDirectory, FILE *file) /* calculate datablock size */ cp= types[nr_types-1]; cp+= strlen(types[nr_types-1]) + 1; /* +1: null-terminator */ - len= (long) (cp - types[0]); + len= (long) (cp - (char*) types[0]); len= (len+3) & ~3; dna_write(file, types[0], len); @@ -977,7 +977,7 @@ int make_structDNA(char *baseDirectory, FILE *file) /* calc datablock size */ sp= structs[nr_structs-1]; sp+= 2+ 2*( sp[1] ); - len= (long) (sp - structs[0]); + len= (long) ((char*) sp - (char*) structs[0]); len= (len+3) & ~3; dna_write(file, structs[0], len); |