From 96ebdbc90ff93f55e202997334ef3ff811f497fb Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 17 Dec 2019 09:42:12 +1100 Subject: Fix deprecated DNA define checks Also remove dead code which checked for SPACE_TIME. --- source/blender/makesdna/intern/makesdna.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/makesdna/intern') 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"); -- cgit v1.2.3