diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-15 07:48:25 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-15 07:48:25 +0400 |
commit | 502081879bee45d0def27e1290ffa45feb3fd6f3 (patch) | |
tree | 22c11aaaf4ba3393ffeec667100aac840a6eb021 /source | |
parent | 747f06d3d23e75bee048bd9957fbe44897ad0ad6 (diff) |
remove unused OceanModifierData member & use smaller flags where possible
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 28 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_ocean.c | 1 |
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; |