diff options
author | Miika Hamalainen <blender@miikah.org> | 2011-11-07 20:36:49 +0400 |
---|---|---|
committer | Miika Hamalainen <blender@miikah.org> | 2011-11-07 20:36:49 +0400 |
commit | edec46b0a6aac18f406991b9e16228d4bd848c61 (patch) | |
tree | 1240768d737c63705fdb38c9832d926ed0bcda94 /source/blender/editors/include/UI_icons.h | |
parent | 2ed6f077b3952123d56916980d18a379ecb3e5ac (diff) | |
parent | 4d7a9e5c055fd3903162b61fdd40fb77b2b96793 (diff) |
Merge with trunk r41625
Diffstat (limited to 'source/blender/editors/include/UI_icons.h')
-rw-r--r-- | source/blender/editors/include/UI_icons.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index f310b8b78f8..4ac5a6eed4a 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -173,6 +173,7 @@ DEF_ICON(NODETREE) DEF_ICON(LOGIC) DEF_ICON(CONSOLE) DEF_ICON(PREFERENCES) +DEF_ICON(CLIP) DEF_ICON(ASSET_MANAGER) #ifndef DEF_ICON_BLANK_SKIP DEF_ICON(BLANK057) @@ -180,7 +181,6 @@ DEF_ICON(ASSET_MANAGER) DEF_ICON(BLANK059) DEF_ICON(BLANK060) DEF_ICON(BLANK061) - DEF_ICON(BLANK061b) #endif /* MODES */ @@ -642,6 +642,8 @@ DEF_ICON(DRIVER) /* ANIMATION */ DEF_ICON(SOLO_OFF) DEF_ICON(SOLO_ON) +DEF_ICON(FRAME_PREV) +DEF_ICON(FRAME_NEXT) #ifndef DEF_ICON_BLANK_SKIP /* available */ DEF_ICON(BLANK186) @@ -666,8 +668,6 @@ DEF_ICON(SOLO_ON) DEF_ICON(BLANK205) DEF_ICON(BLANK206) DEF_ICON(BLANK207) - DEF_ICON(BLANK208) - DEF_ICON(BLANK208b) #endif /* EDITING */ |