diff options
author | mano-wii <germano.costa@ig.com.br> | 2019-12-12 04:31:20 +0300 |
---|---|---|
committer | mano-wii <germano.costa@ig.com.br> | 2019-12-12 04:31:20 +0300 |
commit | f050fa325375ecf8931750baca7846cd830c7370 (patch) | |
tree | 3b652e868960eecd41394faf8db91fe590e10660 /source/blender/editors | |
parent | dc3a165ae0f22a4ff36bf9c7cc7fc189c351b35a (diff) |
Modifier: New Weld Modifier
Part of T70240
This is the initial implementation of Weld Modifier.
New features will be added later.
ToDo:
- Seams: restrict welding to vertices along boundary edges.
- Edge Collapse: collapse edges below the length threshold.
- New icon.
- Some customdata are not being correctly interpolated.
Differential Revision: https://developer.blender.org/D6383
Diffstat (limited to 'source/blender/editors')
-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 d25bca2dc0e..486be952b2f 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; |