remove unused OceanModifierData member & use smaller flags where possible

2 files changed, 15 insertions, 14 deletions

diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 185ef8cbef8..c009b9cc5fb 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -751,7 +751,7 @@ typedef struct ScrewModifierData {
 // #define MOD_SCREW_OBJECT_ANGLE	(1<<4)
 
 typedef struct OceanModifierData {
-	ModifierData modifier;		
+	ModifierData modifier;
 	
 	struct Ocean *ocean;
 	struct OceanCache *oceancache;
@@ -773,25 +773,27 @@ typedef struct OceanModifierData {
 	float	foam_coverage;
 	float	time;
 	
-	int		seed;
-	int		flag;
-	int		output;
-	
-	int		refresh;
-	
 	int		bakestart;
 	int		bakeend;
 	
 	char	cachepath[240];	// FILE_MAX
-	int		cached;
-	
-	int		geometry_mode;
+	char	cached;
+	char	geometry_mode;
+
+	char	flag;
+	char	refresh;
+
+	short	repeat_x;
+	short	repeat_y;
+
+	int		seed;
+
 	float	size;
-	int		repeat_x;
-	int		repeat_y;
 	
 	float	foam_fade;
-	
+
+	int pad;
+
 } OceanModifierData;
 
 #define MOD_OCEAN_GEOM_GENERATE	0
diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c
index e0ccb1f908e..a61cc856662 100644
--- a/source/blender/modifiers/intern/MOD_ocean.c
+++ b/source/blender/modifiers/intern/MOD_ocean.c
@@ -178,7 +178,6 @@ static void copyData(ModifierData *md, ModifierData *target)
 
 	tomd->seed = omd->seed;
 	tomd->flag = omd->flag;
-	tomd->output = omd->output;
 
 	tomd->refresh = 0;