diff options
| author | Joshua Leung <aligorith@gmail.com> | 2015-12-12 07:43:00 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2015-12-12 07:43:00 +0300 |
| commit | 50fde02b422a1a1dbc71a7bc95a061e46ce73b33 (patch) | |
| tree | 631d2de1db5a6321241685f8015f740da64c7a85 /source/blender/bmesh/tools/bmesh_decimate_collapse.c | |
| parent | 85bbf7e04f2694a160219e07fb44711f157e6237 (diff) | |
| parent | dc98a3b0a74b0e91ad424195ce488a9b14f13e73 (diff) | |
Merge branch 'master' into GPencil_Editing_Stage3
Conflicts:
source/blender/editors/transform/transform_manipulator.c
Diffstat (limited to 'source/blender/bmesh/tools/bmesh_decimate_collapse.c')
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_decimate_collapse.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.c b/source/blender/bmesh/tools/bmesh_decimate_collapse.c index ddcbe34e8e1..0a5e5aba86b 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c +++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c @@ -242,6 +242,13 @@ static void bm_decim_build_edge_cost_single( BLI_heap_remove(eheap, eheap_table[BM_elem_index_get(e)]); } + if (UNLIKELY(vweights && + ((vweights[BM_elem_index_get(e->v1)] == 0.0f) || + (vweights[BM_elem_index_get(e->v2)] == 0.0f)))) + { + goto clear; + } + /* check we can collapse, some edges we better not touch */ if (BM_edge_is_boundary(e)) { if (e->l->f->len == 3) { |