diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-13 08:14:35 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-13 08:14:35 +0400 |
commit | 2d1a05874b46d31ee3598ec786a77b45512d99e1 (patch) | |
tree | f0c453f231b52b5898911f77365d908145da8460 /source/blender/editors/include | |
parent | 7be1cd733dfe064d1976b706610c39f97e536b90 (diff) | |
parent | 399ad54204ad9c3bc9dbd15ec4840824d224dc0c (diff) |
svn merge ^/trunk/blender -r44024:44076
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r-- | source/blender/editors/include/UI_icons.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index 8373ea7c52e..f102ecb0d08 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -590,9 +590,9 @@ DEF_ICON(MOD_SCREW) DEF_ICON(MOD_VERTEX_WEIGHT) DEF_ICON(MOD_DYNAMICPAINT) DEF_ICON(MOD_REMESH) +DEF_ICON(MOD_OCEAN) +DEF_ICON(MOD_WARP) #ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK163) - DEF_ICON(BLANK164) DEF_ICON(BLANK165) DEF_ICON(BLANK166) DEF_ICON(BLANK167) |