archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T59640: Transform w/ auto-merge & hidden verts crashes

Browse Source
This commit is contained in:
Campbell Barton
2019-01-16 14:54:52 +11:00
parent 6299d84e10
commit beaa66bb13
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/bmesh/intern/bmesh_operators.c
View File

@@ -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));