diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-06-04 01:11:10 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-06-04 01:11:10 +0400 |
| commit | 329b05dcd789bd8421661898697ed060c83b3286 (patch) | |
| tree | 3d664826fefbe62078c878baab174e066eb48afa /source/blender/makesdna/intern | |
| parent | eabf741a8d76aa9400a071c37227504378fc6315 (diff) | |
| parent | f9856c1c2da8139651eb59ff3bf174065d0f628c (diff) | |
Merged changes in the trunk up to revision 47381.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/blender/makesdna/intern')
| -rw-r--r-- | source/blender/makesdna/intern/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/dna_genfile.c | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt index f8169d5038a..1dd1d7e8f87 100644 --- a/source/blender/makesdna/intern/CMakeLists.txt +++ b/source/blender/makesdna/intern/CMakeLists.txt @@ -1,4 +1,3 @@ -# -*- mode: cmake; indent-tabs-mode: t; -*- # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c index 231dd521f07..2498cba42ef 100644 --- a/source/blender/makesdna/intern/dna_genfile.c +++ b/source/blender/makesdna/intern/dna_genfile.c @@ -93,7 +93,7 @@ typedef long long __int64; * !!Remember to read/write integer and short aligned!! * * While writing a file, the names of a struct is indicated with a type number, - * to be found with: type= findstruct_nr(SDNA *, char *) + * to be found with: type = findstruct_nr(SDNA *, char *) * The value of 'type' corresponds with the the index within the structs array * * For the moment: the complete DNA file is included in a .blend file. For diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index bea9916c704..6b965b04685 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -147,7 +147,7 @@ static char **names, *namedata; /* at address names[a] is string a */ static char **types, *typedata; /* at address types[a] is string a */ static short *typelens; /* at typelens[a] is de length of type a */ static short *alphalens; /* contains sizes as they are calculated on the DEC Alpha (64 bits), in fact any 64bit system */ -static short **structs, *structdata; /* at sp= structs[a] is the first address of a struct definition +static short **structs, *structdata; /* at sp = structs[a] is the first address of a struct definition * sp[0] is type number * sp[1] is amount of elements * sp[2] sp[3] is typenr, namenr (etc) */ @@ -911,7 +911,7 @@ void printStructLengths(void) printf("\n\n*** All detected structs:\n"); while (unknown) { - /*lastunknown= unknown;*/ /*UNUSED*/ + /*lastunknown = unknown;*/ /*UNUSED*/ unknown = 0; /* check all structs... */ @@ -1172,7 +1172,7 @@ int main(int argc, char **argv) } else { fprintf(file, "};\n"); - fprintf(file, "int DNAlen= sizeof(DNAstr);\n"); + fprintf(file, "int DNAlen = sizeof(DNAstr);\n"); fclose(file); } |