Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_draw.c')
-rw-r--r--source/blender/editors/space_outliner/outliner_draw.c7
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;
}