griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki 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 cac3e16cfb
commit c8e5eb58e5
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

@@ -1847,7 +1847,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));

2
source/blender/editors/sculpt_paint/sculpt.c
View File

@@ -5578,7 +5578,7 @@ static int sculpt_symmetrize_exec(bContext *C, wmOperator *UNUSED(op))
BM_mesh_toolflags_set(ss->bm, true);
/* Symmetrize and re-triangulate */
BMO_op_callf(ss->bm, BMO_FLAG_DEFAULTS,
BMO_op_callf(ss->bm, (BMO_FLAG_DEFAULTS & ~BMO_FLAG_RESPECT_HIDE),
"symmetrize input=%avef direction=%i dist=%f",
sd->symmetrize_direction, 0.00001f);
sculpt_dynamic_topology_triangulate(ss->bm);