Scene.GameData DNA alignment nitpicking

* "structures are always multiples of 8 bytes in size" (adding two pads for RecastData)
removing some unecessary pads. Moving others to make pad counting easy.

(although this patch is not highly needed in trunk it will help cucumber merging)
This could probably fixed the problem address at rev.40084

1 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index b2ded4c756a..cb70a8274bd 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -426,8 +426,7 @@ typedef struct GameFraming {
 #define SCE_GAMEFRAMING_EXTEND 1
 #define SCE_GAMEFRAMING_SCALE  2
 
-typedef struct RecastData
-{
+typedef struct RecastData {
 	float cellsize;
 	float cellheight;
 	float agentmaxslope;
@@ -441,6 +440,7 @@ typedef struct RecastData
 	int vertsperpoly;
 	float detailsampledist;
 	float detailsamplemaxerror;
+	short pad1, pad2;
 } RecastData;
 
 typedef struct GameData {
@@ -453,8 +453,7 @@ typedef struct GameData {
 	/* stereo/dome mode */
 	struct GameDome dome;
 	short stereoflag, stereomode;
-	short pad2, pad3;
-	float eyeseparation, pad1;
+	float eyeseparation;
 	RecastData recastData;
 
 
@@ -471,11 +470,12 @@ typedef struct GameData {
 	 * bit 5: (gameengine) : enable Bullet DBVT tree for view frustrum culling
 	*/
 	int flag;
-	short mode, matmode, pad;
+	short mode, matmode;
 	short occlusionRes;		/* resolution of occlusion Z buffer in pixel */
 	short physicsEngine;
+	short pad[2];
 	short ticrate, maxlogicstep, physubstep, maxphystep;
-	short obstacleSimulation;
+	short obstacleSimulation, pad1;
 	float levelHeight;
 } GameData;