From 46682d88128074a4589f882fd1296b6c12c75cf6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 4 Mar 2014 03:47:58 +1100 Subject: Icon for LineStyle patch T37008 from Michael P. --- source/blender/editors/animation/anim_channels_defines.c | 2 +- source/blender/editors/include/UI_icons.h | 2 +- source/blender/editors/space_outliner/outliner_draw.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 4b807059e4a..00a9ff2defb 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -2034,7 +2034,7 @@ static bAnimChannelType ACF_DSNTREE = /* TODO: just get this from RNA? */ static int acf_dslinestyle_icon(bAnimListElem *UNUSED(ale)) { - return ICON_BRUSH_DATA; /* FIXME */ + return ICON_LINE_DATA; } /* get the appropriate flag(s) for the setting when it is valid */ diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index dcc526b81d2..4e15f3ee881 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -258,8 +258,8 @@ DEF_ICON(BOIDS) DEF_ICON(STRANDS) DEF_ICON(LIBRARY_DATA_INDIRECT) DEF_ICON(GREASEPENCIL) +DEF_ICON(LINE_DATA) #ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK083) DEF_ICON(BLANK084) #endif DEF_ICON(GROUP_BONE) diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 763f06bef21..d44a3e60a3f 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -1122,7 +1122,7 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto case ID_LI: tselem_draw_icon_uibut(&arg, ICON_LIBRARY_DATA_DIRECT); break; case ID_LS: - tselem_draw_icon_uibut(&arg, ICON_BRUSH_DATA); break; /* FIXME proper icon */ + tselem_draw_icon_uibut(&arg, ICON_LINE_DATA); break; } } } -- cgit v1.2.3