diff options
| author | Jacques Lucke <mail@jlucke.com> | 2019-08-23 11:01:55 +0300 |
|---|---|---|
| committer | Jacques Lucke <mail@jlucke.com> | 2019-08-23 11:01:55 +0300 |
| commit | dc383b2bfdac1be22abf1b01935fff98872a2cd0 (patch) | |
| tree | f9d1f8ac8a45499e1e0b27aa6b25c89aa87afa55 /source/blender/editors/space_outliner/outliner_draw.c | |
| parent | c20301adf1faa698a6499dd56e94336a50c1ebe5 (diff) | |
| parent | a1aa4a259713f26c32a5fac4adbe0751e0479f5b (diff) | |
Merge branch 'master' into functions
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_draw.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 192aa2682b6..32436af598f 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; @@ -2322,7 +2322,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; @@ -2333,7 +2333,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)) { |