diff options
Diffstat (limited to 'source/blender/editors/space_outliner/outliner.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner.c | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c index 7104fad1767..16748af39d5 100644 --- a/source/blender/editors/space_outliner/outliner.c +++ b/source/blender/editors/space_outliner/outliner.c @@ -1750,7 +1750,7 @@ static int tree_element_active_texture(Scene *scene, SpaceOops *soops, TreeEleme if(set) { if(sbuts) { - sbuts->tabo= TAB_SHADING_TEX; // hack from header_buttonswin.c + // XXX sbuts->tabo= TAB_SHADING_TEX; // hack from header_buttonswin.c sbuts->texfrom= 1; } // XXX extern_set_butspace(F6KEY, 0); // force shading buttons texture @@ -1764,7 +1764,7 @@ static int tree_element_active_texture(Scene *scene, SpaceOops *soops, TreeEleme Lamp *la= (Lamp *)tselemp->id; if(set) { if(sbuts) { - sbuts->tabo= TAB_SHADING_TEX; // hack from header_buttonswin.c + // XXX sbuts->tabo= TAB_SHADING_TEX; // hack from header_buttonswin.c sbuts->texfrom= 2; } // XXX extern_set_butspace(F6KEY, 0); // force shading buttons texture @@ -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; @@ -3643,7 +3643,7 @@ static void tselem_draw_icon(float x, float y, TreeStoreElem *tselem, TreeElemen UI_icon_draw(x, y, ICON_OBJECT_DATA); break; case TSE_RNA_STRUCT: - UI_icon_draw(x, y, UI_GetIconRNA(&te->rnaptr)); + UI_icon_draw(x, y, RNA_struct_ui_icon(te->rnaptr.type)); break; default: UI_icon_draw(x, y, ICON_DOT); 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: |