diff options
| author | Jacques Lucke <mail@jlucke.com> | 2019-12-12 13:17:04 +0300 |
|---|---|---|
| committer | Jacques Lucke <mail@jlucke.com> | 2019-12-12 13:17:04 +0300 |
| commit | ee52b2f7d8dde3e9ed56925776d7ad2551388ca0 (patch) | |
| tree | 3468488adf3636dccbf8e1f5395e15cc92617e0b /source/blender/editors/space_outliner/outliner_draw.c | |
| parent | 6d3cd34bd518220f3fa3bc9bc687836a490fcb8b (diff) | |
| parent | 059f7413c4cf2fed8a4189ade4a609f9758f6022 (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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 0e408077206..9a6f685f5fc 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -2172,6 +2172,9 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te) case eModifierType_Wireframe: data.icon = ICON_MOD_WIREFRAME; break; + case eModifierType_Weld: + data.icon = ICON_AUTOMERGE_OFF; /* XXX, needs own icon */ + break; case eModifierType_LaplacianDeform: data.icon = ICON_MOD_MESHDEFORM; /* XXX, needs own icon */ break; |