diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-12-05 06:12:49 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-12-05 06:12:49 +0400 |
| commit | 3197796cf7aa4f1c34f2e68a2eca9d6a412a51d0 (patch) | |
| tree | 5a0a119149b1079f888178bc2df3d15950c2f9b9 /source/blender/makesdna/intern/makesdna.c | |
| parent | 43c5e1b58030322096770b1aa4d91077793cd2c4 (diff) | |
| parent | eb233d933223a3795f3ff5204c4412f7a0fd6782 (diff) | |
Merged changes in the trunk up to revision 42425.
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source/blender/makesdna/intern/makesdna.c')
| -rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 6d96f423afb..e869ccc3d77 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -311,8 +311,9 @@ static int add_name(const char *str) if (debugSDNA > 3) printf("seen %c ( %d) \n", str[j], str[j]); j++; } - if (debugSDNA > 3) printf("seen %c ( %d) \n", str[j], str[j]); - if (debugSDNA > 3) printf("special after offset %d\n", j); + if (debugSDNA > 3) printf("seen %c ( %d) \n" + "special after offset%d\n", + str[j], str[j], j); if (!isfuncptr) { /* multidimensional array pointer case */ @@ -476,6 +477,13 @@ static int preprocess_include(char *maindata, int len) if(comment); else if( cp[0]==' ' && cp[1]==' ' ); else if( cp[-1]=='*' && cp[0]==' ' ); /* pointers with a space */ + + /* skip special keywords */ + else if (strncmp("DNA_DEPRECATED", cp, 14)==0) { + /* single values are skipped already, so decrement 1 less */ + a -= 13; + cp += 13; + } else { md[0]= cp[0]; md++; |