diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-23 20:46:35 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-23 20:46:35 +0400 |
| commit | 5cc898ada2fbe11e1847c385b0c0439df3a706df (patch) | |
| tree | 5b61839f273a2f4204f4cf92b291ef9e01ce7e06 /source/blender/makesrna/intern/rna_modifier.c | |
| parent | 6c9438ea8a34054c66690a8c5d49162d0fd9379a (diff) | |
| parent | 74b4fd26d2d1dde537a46f9237839c057cd03aaf (diff) | |
svn merge ^/trunk/blender -r43616:43639
Diffstat (limited to 'source/blender/makesrna/intern/rna_modifier.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index d38d2270fc5..0486b997915 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -2917,7 +2917,7 @@ static void rna_def_modifier_ocean(BlenderRNA *brna) srna= RNA_def_struct(brna, "OceanModifier", "Modifier"); RNA_def_struct_ui_text(srna, "Ocean Modifier", "Simulate an ocean surface"); RNA_def_struct_sdna(srna, "OceanModifierData"); - RNA_def_struct_ui_icon(srna, ICON_MOD_FLUIDSIM); + RNA_def_struct_ui_icon(srna, ICON_MOD_WAVE); /* General check if blender was built with OceanSim modifier support */ prop= RNA_def_property(srna, "is_build_enabled", PROP_BOOLEAN, PROP_NONE); |