diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-20 20:05:51 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-20 20:05:51 +0400 |
commit | 8eb41f0fdb77062d5828dd2c3e18ffeab5fd428c (patch) | |
tree | 1b81bf423db957bf39dc01521533f8a0872842d0 /source/blender/makesdna/DNA_modifier_types.h | |
parent | 3c8d86e117b54914524cbc49a8678ecaad8671cf (diff) | |
parent | f1eb66aa68105ac27f371f4f708d8abf3b7da38b (diff) |
svn merge ^/trunk/blender -r41998:42009
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index c2dfcd1d441..194287d9abc 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -781,6 +781,7 @@ typedef struct OceanModifierData { int bakeend; char cachepath[240]; // FILE_MAX + char foamlayername[32]; char cached; char geometry_mode; |