diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-16 06:54:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-16 07:03:17 +0300 |
| commit | beaa66bb13a5d801ec10957922b2d90e04ca5d7c (patch) | |
| tree | 7ca67d898abc8e536e3b231382c892e2404766c1 /source/blender/bmesh/intern/bmesh_operators.c | |
| parent | 6299d84e103f3c8e0bb49188f0353220abb5c860 (diff) | |
Fix T59640: Transform w/ auto-merge & hidden verts crashes
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_operators.c')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_operators.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c index 4bc09c173f6..60de182499b 100644 --- a/source/blender/bmesh/intern/bmesh_operators.c +++ b/source/blender/bmesh/intern/bmesh_operators.c @@ -1851,7 +1851,12 @@ bool BMO_op_vinitf(BMesh *bm, BMOperator *op, const int flag, const char *_fmt, BMO_slot_buffer_from_disabled_hflag(bm, op, op->slots_in, slot_name, htype, va_arg(vlist, int)); } else if (type == 'a') { - BMO_slot_buffer_from_all(bm, op, op->slots_in, slot_name, htype); + if ((op->flag & BMO_FLAG_RESPECT_HIDE) == 0) { + BMO_slot_buffer_from_all(bm, op, op->slots_in, slot_name, htype); + } + else { + BMO_slot_buffer_from_disabled_hflag(bm, op, op->slots_in, slot_name, htype, BM_ELEM_HIDDEN); + } } else if (type == 'f') { BMO_slot_buffer_from_enabled_flag(bm, op, op->slots_in, slot_name, htype, va_arg(vlist, int)); |