From 6a03199b50e02d57a50eb24441ef7be0b7e965ac Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 27 Feb 2019 15:07:50 +1100 Subject: Cleanup: use '_pad' convention for padding in all DNA structs Avoids mixing these in with regular variables in code-completion. Use char for pad members except for 'void *', to make size clearer. Removed/shrink a few redundant padding vars which were >= 8 bytes. --- source/blender/makesdna/DNA_fileglobal_types.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/makesdna/DNA_fileglobal_types.h') diff --git a/source/blender/makesdna/DNA_fileglobal_types.h b/source/blender/makesdna/DNA_fileglobal_types.h index 6f7eb6fcfc3..6daa0f5aeb3 100644 --- a/source/blender/makesdna/DNA_fileglobal_types.h +++ b/source/blender/makesdna/DNA_fileglobal_types.h @@ -34,11 +34,11 @@ typedef struct FileGlobal { short subversion; short minversion, minsubversion; - char pad[6]; + char _pad[6]; struct bScreen *curscreen; struct Scene *curscene; struct ViewLayer *cur_view_layer; - void *pad1; + void *_pad1; int fileflags; int globalf; -- cgit v1.2.3