From 2a9214eaaf04959590ff979451b98e49697264cc Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Thu, 16 May 2019 18:03:20 -0600 Subject: 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. --- source/blender/makesdna/DNA_object_types.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/blender/makesdna') 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 { -- cgit v1.2.3