diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-21 21:26:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-21 21:26:15 +0400 |
| commit | 245a9db713e37becc87a9285a905458a2d9b380d (patch) | |
| tree | 654a5bc11f750fdb3fa2f791c8dce35d0c83b858 /source/blender/editors | |
| parent | fdc3b7dfefbd980c8606a3a2639fbceaeb52cb13 (diff) | |
patch [#34687] Patch for AutoMerge button in 3d editor
from Dan McGrath (dmcgrath)
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/include/UI_icons.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index 0560cbd69cc..2e2842210c2 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -748,10 +748,8 @@ DEF_ICON(PASTEFLIPDOWN) DEF_ICON(BLANK230) #endif DEF_ICON(SNAP_SURFACE) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK232) - DEF_ICON(BLANK233) -#endif +DEF_ICON(AUTOMERGE_ON) +DEF_ICON(AUTOMERGE_OFF) DEF_ICON(RETOPO) DEF_ICON(UV_VERTEXSEL) DEF_ICON(UV_EDGESEL) |