diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-19 19:11:49 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-19 19:11:49 +0300 |
commit | bca7563d072f111807fd384d5cf0fcf9d91eccb1 (patch) | |
tree | 36339042217887c6e9aaf3f5f6c5103d8fcf75b8 /source/blender/makesdna/intern | |
parent | d03024f6b33043c03371efeb04641f4cfcf7cc40 (diff) | |
parent | e2678d6b7b73366777f85b10dc9bd0cc2ee8181e (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/intern')
-rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index a2c1e4d9463..c1f8341ddc6 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -573,9 +573,10 @@ static int convert_include(const char *filename) /* read include file, skip structs with a '#' before it. * store all data in temporal arrays. */ - int filelen, count, overslaan, slen, type, name, strct; + int filelen, count, slen, type, name, strct; short *structpoin, *sp; char *maindata, *mainend, *md, *md1; + bool skip_struct; md = maindata = read_file_data(filename, &filelen); if (filelen == -1) { @@ -588,18 +589,18 @@ static int convert_include(const char *filename) /* we look for '{' and then back to 'struct' */ count = 0; - overslaan = 0; + skip_struct = false; while (count < filelen) { /* code for skipping a struct: two hashes on 2 lines. (preprocess added a space) */ if (md[0] == '#' && md[1] == ' ' && md[2] == '#') { - overslaan = 1; + skip_struct = true; } if (md[0] == '{') { md[0] = 0; - if (overslaan) { - overslaan = 0; + if (skip_struct) { + skip_struct = false; } else { if (md[-1] == ' ') md[-1] = 0; |