[Bf-blender-cvs] [23fc746] wiggly-widgets: Fix DNA alignment error on 32 bit systems

[Julian Eisel]

Commit: 23fc746d3adac917f27448b4ce34046d3f278780
Author: Julian Eisel
Date:   Mon May 9 23:57:29 2016 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB23fc746d3adac917f27448b4ce34046d3f278780

Fix DNA alignment error on 32 bit systems

===================================================================

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 97ded2f..3fbf3e9 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -293,6 +293,7 @@ typedef struct Object {
 	struct CurveCache *curve_cache;
 
 	struct DerivedMesh *derivedDeform, *derivedFinal;
+	void *pad4; /* 32 bit only */
 	uint64_t lastDataMask;   /* the custom data layer mask that was last used to calculate derivedDeform and derivedFinal */
 	uint64_t customdata_mask; /* (extra) custom data layer mask to use for creating derivedmesh, set by depsgraph */
 	unsigned int state;			/* bit masks of game controllers that are active */