Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2018-12-29 20:26:04 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2019-01-04 17:51:46 +0300
commit2891043b585b4773b07c607b20befae35979dbb7 (patch)
tree8ee264376dc48f18bce36e97dcaf7dba1122c04c /source/blender/editors/space_outliner/outliner_draw.c
parent4053ed022b078e48858472b9e1b0e12fdb360865 (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/outliner_draw.c')
-rw-r--r--source/blender/editors/space_outliner/outliner_draw.c4
1 files changed, 4 insertions, 0 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;
}