diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-09-17 03:54:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-09-17 03:54:33 +0400 |
| commit | 771bad9c6abaad4b742935e5d55067f281287650 (patch) | |
| tree | f5325241d866890ae7a155eb112019090dfbf05a /source/blender/blenkernel/intern/pbvh_bmesh.c | |
| parent | 3cdfea119d93ea3d1ec5096cb7d218c7ae4991d5 (diff) | |
| parent | f0f398dcf3101079f4965185eb82c23c54fc6923 (diff) | |
Merge branch 'master' into soc-2014-viewport_context
Diffstat (limited to 'source/blender/blenkernel/intern/pbvh_bmesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/pbvh_bmesh.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c index 1218e3a063c..55653f41e75 100644 --- a/source/blender/blenkernel/intern/pbvh_bmesh.c +++ b/source/blender/blenkernel/intern/pbvh_bmesh.c @@ -546,7 +546,8 @@ static void edge_queue_insert(EdgeQueueContext *eq_ctx, BMEdge *e, * should already make the brush move the vertices only 50%, which means * that topology updates will also happen less frequent, that should be * enough. */ - if ((check_mask(eq_ctx, e->v1) || check_mask(eq_ctx, e->v2)) && + if (((eq_ctx->cd_vert_mask_offset == -1) || + (check_mask(eq_ctx, e->v1) || check_mask(eq_ctx, e->v2))) && !(BM_elem_flag_test_bool(e->v1, BM_ELEM_HIDDEN) || BM_elem_flag_test_bool(e->v2, BM_ELEM_HIDDEN))) { |