diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-24 13:54:48 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-30 18:56:54 +0300 |
commit | d2ad256326736c8a4c746163f9b27491d8a6e95a (patch) | |
tree | 988048ddf643dd6a4f9b54d6705b411d41880a7c /source/blender/editors/include | |
parent | af21053087b93c015435a62cbedade03772c52c7 (diff) |
UI: add dedicated icon IDs for decorators, tool settings, shaderfx, overlays.
The preset and decorator icons were updated to be monochrome and draw in the
same color as text. Other icons are unchanged, having them as separate icon IDs
prepares for an artist to make them.
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r-- | source/blender/editors/include/UI_icons.h | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index dec02faf85c..5601beb9228 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -113,7 +113,9 @@ DEF_ICON(FILE_TICK) DEF_ICON(QUIT) DEF_ICON(URL) DEF_ICON(RECOVER_LAST) -DEF_ICON(PRESET) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK030) +#endif DEF_ICON(FULLSCREEN_ENTER) DEF_ICON(FULLSCREEN_EXIT) DEF_ICON(BLANK1) // Not actually blank - this is used all over the place @@ -133,9 +135,9 @@ DEF_ICON(PARTICLES) DEF_ICON(PHYSICS) DEF_ICON(SPEAKER) DEF_ICON(TEXTURE_SHADED) +DEF_ICON(TOOL_SETTINGS) +DEF_ICON(SHADERFX) #ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK042) - DEF_ICON(BLANK043) DEF_ICON(BLANK044) DEF_ICON(BLANK045) DEF_ICON(BLANK046) @@ -275,19 +277,22 @@ DEF_ICON(MOUSE_MOVE) DEF_ICON(MOUSE_LMB_DRAG) DEF_ICON(MOUSE_MMB_DRAG) DEF_ICON(MOUSE_RMB_DRAG) - #ifndef DEF_ICON_BLANK_SKIP DEF_ICON(BLANK099) - DEF_ICON(BLANK100) +#endif +DEF_ICON(PRESET) +#ifndef DEF_ICON_BLANK_SKIP DEF_ICON(BLANK101) - DEF_ICON(BLANK102) - DEF_ICON(BLANK103) - DEF_ICON(BLANK104) - DEF_ICON(BLANK105) - DEF_ICON(BLANK106) - DEF_ICON(BLANK107) - DEF_ICON(BLANK108) - DEF_ICON(BLANK109) +#endif +DEF_ICON(DECORATE) +DEF_ICON(DECORATE_KEYFRAME) +DEF_ICON(DECORATE_ANIMATE) +DEF_ICON(DECORATE_DRIVER) +DEF_ICON(DECORATE_LINKED) +DEF_ICON(DECORATE_OVERRIDE) +DEF_ICON(DECORATE_UNLOCKED) +DEF_ICON(DECORATE_LOCKED) +#ifndef DEF_ICON_BLANK_SKIP DEF_ICON(BLANK110) DEF_ICON(BLANK111) DEF_ICON(BLANK112) @@ -759,9 +764,7 @@ DEF_ICON(WIRE) DEF_ICON(SOLID) DEF_ICON(SMOOTH) DEF_ICON(POTATO) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK248) -#endif +DEF_ICON(OVERLAY) DEF_ICON(ORTHO) #ifndef DEF_ICON_BLANK_SKIP DEF_ICON(BLANK249) |