diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-05-05 15:40:42 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-05-05 15:40:42 +0400 |
| commit | bb1f8d9586220446c4df6339554b6cb0af02f030 (patch) | |
| tree | 8b0778b7f5e8eb18b7ce817e150efc949adcab22 /source/blender/makesdna/intern/makesdna.c | |
| parent | 19e27ce15b213bc7c888e4a57ad97faa5dbb4220 (diff) | |
| parent | f1e3c31d4ffa86b695fddd45d9ccc6ce9ac62ea7 (diff) | |
Merged changes in the trunk up to revision 46309.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_tools.c
Diffstat (limited to 'source/blender/makesdna/intern/makesdna.c')
| -rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index a9c8c1bfe9c..ec5b0cb8762 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -362,8 +362,8 @@ static int add_name(const char *str) * */ buf[i] = 0; if (debugSDNA > 3) printf("Name before chomping: %s\n", buf); - if ((strncmp(buf,"(*headdraw", 10) == 0) || - (strncmp(buf,"(*windraw", 9) == 0) ) + if ((strncmp(buf, "(*headdraw", 10) == 0) || + (strncmp(buf, "(*windraw", 9) == 0) ) { buf[i] = ')'; buf[i+1] = '('; @@ -768,7 +768,7 @@ static int calculate_structlens(int firststruct) } if (alphalen % 8) { - printf("Align pointer error in struct (alphalen8): %s %s\n", types[structtype],cp); + printf("Align pointer error in struct (alphalen8): %s %s\n", types[structtype], cp); dna_error = 1; } @@ -794,7 +794,7 @@ static int calculate_structlens(int firststruct) /* struct alignment */ if (type >= firststruct) { if (sizeof(void *)==8 && (len % 8) ) { - printf("Align struct error: %s %s\n", types[structtype],cp); + printf("Align struct error: %s %s\n", types[structtype], cp); dna_error = 1; } } @@ -876,6 +876,8 @@ static int calculate_structlens(int firststruct) printf(" %s\n", types[structtype]); } } + + dna_error = 1; } return(dna_error); @@ -892,7 +894,7 @@ void dna_write(FILE *file, void *pntr, int size) data = (char *) pntr; for (i = 0 ; i < size ; i++) { - fprintf(file, "%d,", data[i]); + fprintf(file, "%d, ", data[i]); linelength++; if (linelength >= MAX_DNA_LINE_LENGTH) { fprintf(file, "\n"); @@ -991,7 +993,7 @@ static int make_structDNA(char *baseDirectory, FILE *file) /* FOR DEBUG */ if (debugSDNA > 1) { - int a,b; + int a, b; /* short *elem; */ short num_types; @@ -1009,7 +1011,7 @@ static int make_structDNA(char *baseDirectory, FILE *file) for (a=0; a<nr_structs; a++) { sp= structs[a]; - printf(" struct %s elems: %d size: %d\n", types[sp[0]], sp[1],typelens[sp[0]]); + printf(" struct %s elems: %d size: %d\n", types[sp[0]], sp[1], typelens[sp[0]]); num_types = sp[1]; sp+= 2; /* ? num_types was elem? */ |