diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-29 04:59:04 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-29 04:59:04 +0400 |
| commit | 2585d524057da908668bb6d5ff7ec8b344d23093 (patch) | |
| tree | 2494aaa2281e568e4904fbe419f6a032535c65ad /source/blender/makesdna/intern/makesdna.c | |
| parent | d8e12e8710f7c24e046c132e84eff416b8e8d06c (diff) | |
| parent | 4465d2f419a8515df41a8fc415774eedaef0e6f6 (diff) | |
Merged changes in the trunk up to revision 46045.
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesdna/DNA_scene_types.h
Diffstat (limited to 'source/blender/makesdna/intern/makesdna.c')
| -rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index a8877ccf943..a9c8c1bfe9c 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -362,8 +362,9 @@ 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] = '('; buf[i+2] = 'v'; @@ -890,8 +891,7 @@ void dna_write(FILE *file, void *pntr, int size) data = (char *) pntr; - for (i = 0 ; i < size ; i++) - { + for (i = 0 ; i < size ; i++) { fprintf(file, "%d,", data[i]); linelength++; if (linelength >= MAX_DNA_LINE_LENGTH) { @@ -1096,7 +1096,7 @@ static int make_structDNA(char *baseDirectory, FILE *file) sp += firststruct; for (a=firststruct; a<nr_types; a++, sp++) { if (*sp) { - fprintf(fp, "\tif(sizeof(struct %s) - %d) printf(\"ALIGN ERROR:", types[a], *sp); + fprintf(fp, "\tif (sizeof(struct %s) - %d) printf(\"ALIGN ERROR:", types[a], *sp); fprintf(fp, "%%d %s %d ", types[a], *sp); fprintf(fp, "\\n\", sizeof(struct %s) - %d);\n", types[a], *sp); } |