[Bf-blender-cvs] [2a9214eaaf0] master: makesdna: Fix build error on win32.
Ray Molenkamp
noreply at git.blender.org
Fri May 17 02:03:26 CEST 2019
Commit: 2a9214eaaf04959590ff979451b98e49697264cc
Author: Ray Molenkamp
Date: Thu May 16 18:03:20 2019 -0600
Branches: master
https://developer.blender.org/rB2a9214eaaf04959590ff979451b98e49697264cc
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.
===================================================================
M source/blender/makesdna/DNA_object_types.h
===================================================================
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 {
More information about the Bf-blender-cvs
mailing list