diff options
| author | Matt Ebb <matt@mke3.net> | 2009-05-23 11:19:31 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2009-05-23 11:19:31 +0400 |
| commit | 5b5d2132904a13c31679c263988a4a36bae8eee5 (patch) | |
| tree | 748d5b6015261857007f16d33ca111622c7213d9 /source/blender/editors/space_outliner | |
| parent | 380efe9dc47978431d81642ce538676be59bad18 (diff) | |
* Updated a whole swag of excellent new icons by jendryzch.
This includes a bunch of new object primitive icons
which would be great to get into the 'add object' menus,
they're not there yet. The specific lamp data type icons
are now used in the outliner though, which is very helpful.
Diffstat (limited to 'source/blender/editors/space_outliner')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c index 7104fad1767..2d544b402ec 100644 --- a/source/blender/editors/space_outliner/outliner.c +++ b/source/blender/editors/space_outliner/outliner.c @@ -3524,7 +3524,7 @@ static void tselem_draw_icon(float x, float y, TreeStoreElem *tselem, TreeElemen case TSE_NLA_ACTION: UI_icon_draw(x, y, ICON_ACTION); break; case TSE_DEFGROUP_BASE: - UI_icon_draw(x, y, ICON_VGROUP); break; + UI_icon_draw(x, y, ICON_GROUP_VERTEX); break; case TSE_BONE: case TSE_EBONE: UI_icon_draw(x, y, ICON_BONE_DATA); break; @@ -3688,7 +3688,25 @@ static void tselem_draw_icon(float x, float y, TreeStoreElem *tselem, TreeElemen case ID_LT: UI_icon_draw(x, y, ICON_OUTLINER_DATA_LATTICE); break; case ID_LA: - UI_icon_draw(x, y, ICON_OUTLINER_DATA_LAMP); break; + { + Lamp *la= (Lamp *)tselem->id; + + switch(la->type) { + case LA_LOCAL: + UI_icon_draw(x, y, ICON_LAMP_POINT); break; + case LA_SUN: + UI_icon_draw(x, y, ICON_LAMP_SUN); break; + case LA_SPOT: + UI_icon_draw(x, y, ICON_LAMP_SPOT); break; + case LA_HEMI: + UI_icon_draw(x, y, ICON_LAMP_HEMI); break; + case LA_AREA: + UI_icon_draw(x, y, ICON_LAMP_AREA); break; + default: + UI_icon_draw(x, y, ICON_OUTLINER_DATA_LAMP); break; + } + break; + } case ID_MA: UI_icon_draw(x, y, ICON_MATERIAL_DATA); break; case ID_TE: |