diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-01 11:45:50 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-08 20:46:00 +0300 |
| commit | 2ac65f6153a2da2df7cda908689bb7c1865f088d (patch) | |
| tree | 8fafb849b75451ebb0ec6ba8d1c70bfbae2f31a7 /source/blender/editors/space_outliner/outliner_draw.c | |
| parent | 192a99f47784277baa9eab4864bae1b4382b243c (diff) | |
UI: new icon set by Andrzej Ambroz.
This is a monochrome icon set, with a more modern look and icons for
various features that did not have a proper icon before.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_draw.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index f95081da4a5..3bf85dd7e57 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -1143,7 +1143,7 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te) else if (te->idcode == SEQ_TYPE_SOUND_RAM) data.icon = ICON_SOUND; else if (te->idcode == SEQ_TYPE_IMAGE) - data.icon = ICON_IMAGE_COL; + data.icon = ICON_IMAGE; else data.icon = ICON_PARTICLES; break; @@ -1226,6 +1226,9 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te) if (ob->dup_group) { data.icon = ICON_OUTLINER_OB_GROUP_INSTANCE; } + else if (ob->empty_drawtype == OB_EMPTY_IMAGE) { + data.icon = ICON_OUTLINER_OB_IMAGE; + } else { data.icon = ICON_OUTLINER_OB_EMPTY; } @@ -1328,7 +1331,7 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te) data.icon = ICON_BRUSH_DATA; break; case ID_SCR: case ID_WS: - data.icon = ICON_SPLITSCREEN; break; + data.icon = ICON_WORKSPACE; break; default: break; } |