diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2018-12-29 20:26:04 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2019-01-04 17:51:46 +0300 |
commit | 2891043b585b4773b07c607b20befae35979dbb7 (patch) | |
tree | 8ee264376dc48f18bce36e97dcaf7dba1122c04c /source/blender/editors/space_outliner | |
parent | 4053ed022b078e48858472b9e1b0e12fdb360865 (diff) |
Outliner: better support for clips/masks ('Blender File' view)
- clips/masks were not showing an icon [both dont have a dedicated icon,
took the ones used elsewhere]
- masks hit an assert in outliner_add_element()
- missing outliner update when adding a mask
spotted while looking into T59939
Reviewers: mont29, brecht
Differential Revision: https://developer.blender.org/D4142
Diffstat (limited to 'source/blender/editors/space_outliner')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/outliner_intern.h | 2 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/space_outliner.c | 5 |
3 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 463eb1b33b4..97c5c1db4cb 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -1340,6 +1340,10 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te) case ID_SCR: case ID_WS: data.icon = ICON_WORKSPACE; break; + case ID_MSK: + data.icon = ICON_MOD_MASK; break; + case ID_MC: + data.icon = ICON_SEQUENCE; break; default: break; } diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h index 23ea14abc31..d6ebddf94e2 100644 --- a/source/blender/editors/space_outliner/outliner_intern.h +++ b/source/blender/editors/space_outliner/outliner_intern.h @@ -92,7 +92,7 @@ typedef struct TreeElementIcon { #define TREESTORE_ID_TYPE(_id) \ (ELEM(GS((_id)->name), ID_SCE, ID_LI, ID_OB, ID_ME, ID_CU, ID_MB, ID_NT, ID_MA, ID_TE, ID_IM, ID_LT, ID_LA, ID_CA) || \ ELEM(GS((_id)->name), ID_KE, ID_WO, ID_SPK, ID_GR, ID_AR, ID_AC, ID_BR, ID_PA, ID_GD, ID_LS, ID_LP) || \ - ELEM(GS((_id)->name), ID_SCR, ID_WM, ID_TXT, ID_VF, ID_SO, ID_CF, ID_PAL, ID_MC, ID_WS)) /* Only in 'blendfile' mode ... :/ */ + ELEM(GS((_id)->name), ID_SCR, ID_WM, ID_TXT, ID_VF, ID_SO, ID_CF, ID_PAL, ID_MC, ID_WS, ID_MSK)) /* Only in 'blendfile' mode ... :/ */ /* TreeElement->flag */ enum { diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c index 95225774ddf..423641c6fdd 100644 --- a/source/blender/editors/space_outliner/space_outliner.c +++ b/source/blender/editors/space_outliner/space_outliner.c @@ -228,6 +228,11 @@ static void outliner_main_region_listener( ED_region_tag_redraw(ar); } break; + case NC_MASK: + if (ELEM(wmn->action, NA_ADDED)) { + ED_region_tag_redraw(ar); + } + break; } } |