diff options
author | Nathan Craddock <nzcraddock@gmail.com> | 2019-08-22 23:00:22 +0300 |
---|---|---|
committer | Nathan Craddock <nzcraddock@gmail.com> | 2019-08-22 23:40:33 +0300 |
commit | 1de7717ed711c53755a2f1393ab103fd98bf6b32 (patch) | |
tree | 278364574e57a38bc62537776ab61a91bf750268 /source/blender | |
parent | 22ebc579872bb4c3d8e9428505058709f76db155 (diff) |
Outliner: new icons for sequences and contraints
Adds a new icon for the action constraint so the icon draws with the
constraints color. Also adds two new icons for sequencer meta strips
and duplicate strips for use in the outliner sequence display mode.
The meta strip icon could be used in the sequencer sidebar.
Diffstat (limited to 'source/blender')
-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)) { |