diff options
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/include/UI_icons.h | 6 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index d615ea34bb1..41ac1b6b452 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -483,7 +483,7 @@ DEF_ICON(UNDERLINE) DEF_ICON(SMALL_CAPS) DEF_ICON_BLANK(742) DEF_ICON_BLANK(743) -DEF_ICON_BLANK(744) +DEF_ICON_MODIFIER(CON_ACTION) DEF_ICON_BLANK(745) DEF_ICON_BLANK(746) DEF_ICON_BLANK(747) @@ -866,8 +866,8 @@ DEF_ICON(SEQ_LUMA_WAVEFORM) DEF_ICON(SEQ_CHROMA_SCOPE) DEF_ICON(SEQ_HISTOGRAM) DEF_ICON(SEQ_SPLITVIEW) -DEF_ICON_BLANK(870) -DEF_ICON_BLANK(871) +DEF_ICON(SEQ_STRIP_META) +DEF_ICON(SEQ_STRIP_DUPLICATE) DEF_ICON_BLANK(872) DEF_ICON(IMAGE_RGB) // XXX CHANGE TO STRAIGHT ALPHA, Z ETC DEF_ICON(IMAGE_RGB_ALPHA) diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 5116e58453f..a2ca3254b30 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -1994,7 +1994,7 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te) data.icon = ICON_CON_TRACKTO; break; case CONSTRAINT_TYPE_ACTION: - data.icon = ICON_ACTION; + data.icon = ICON_CON_ACTION; break; case CONSTRAINT_TYPE_ARMATURE: data.icon = ICON_CON_ARMATURE; @@ -2319,7 +2319,7 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te) data.icon = ICON_ARROW_LEFTRIGHT; break; case SEQ_TYPE_META: - data.icon = ICON_DOT; + data.icon = ICON_SEQ_STRIP_META; break; default: data.icon = ICON_DOT; @@ -2330,7 +2330,7 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te) data.icon = ICON_LIBRARY_DATA_DIRECT; break; case TSE_SEQUENCE_DUP: - data.icon = ICON_OBJECT_DATA; + data.icon = ICON_SEQ_STRIP_DUPLICATE; break; case TSE_RNA_STRUCT: if (RNA_struct_is_ID(te->rnaptr.type)) { |