diff options
author | Ray Molenkamp <github@lazydodo.com> | 2019-05-17 03:03:20 +0300 |
---|---|---|
committer | Ray Molenkamp <github@lazydodo.com> | 2019-05-17 03:03:20 +0300 |
commit | 2a9214eaaf04959590ff979451b98e49697264cc (patch) | |
tree | 2ad7e105b77990b54738a016ddbfa4d22324c670 | |
parent | 387c1f2e0d5d3584f735630813db0930040b2e81 (diff) |
makesdna: Fix build error on win32.
Win32 has some special struct alignment rules that makesdna
is not warning about. See
https://developer.blender.org/T63164#652815
for details.
-rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 0b2f3d69bd2..4287017543b 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -170,6 +170,8 @@ typedef struct Object_Runtime { /** Runtime grease pencil drawing data */ struct GpencilBatchCache *gpencil_cache; + + void *_pad2; /* Padding is here for win32s unconventional stuct alignment rules. */ } Object_Runtime; typedef struct Object { |