Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-12-17 01:42:12 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-12-17 01:49:23 +0300
commit96ebdbc90ff93f55e202997334ef3ff811f497fb (patch)
treef46426f457b80991250e98c1a580fa3b064ff336 /source/blender/makesdna/intern/makesdna.c
parentbcd38b398ce19a1757ab1f7f51ef50df8eef8d41 (diff)
Fix deprecated DNA define checks
Also remove dead code which checked for SPACE_TIME.
Diffstat (limited to 'source/blender/makesdna/intern/makesdna.c')
-rw-r--r--source/blender/makesdna/intern/makesdna.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index 9a5b2290e10..dc32ca7e244 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -903,7 +903,8 @@ static int calculate_struct_sizes(int firststruct, FILE *file_verify, const char
/* Write test to verify sizes are accurate. */
fprintf(file_verify, "/* Verify struct sizes and member offsets are as expected by DNA. */\n");
fprintf(file_verify, "#include \"BLI_assert.h\"\n\n");
- fprintf(file_verify, "#define DNA_DEPRECATED\n");
+ /* Needed so we can find offsets of deprecated structs. */
+ fprintf(file_verify, "#define DNA_DEPRECATED_ALLOW\n");
/* Workaround enum naming collision in static asserts
* (ideally this included a unique name/id per file). */
fprintf(file_verify, "#define assert_line_ assert_line_DNA_\n");