griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix possible use of invalid face index with wireframe tool

Browse Source
This commit is contained in:
Campbell Barton
2014-03-24 21:04:13 +11:00
parent 76d32a3f16
commit 25835ec977
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/bmesh/tools/bmesh_wireframe.c
View File

@@ -227,16 +227,18 @@ void BM_mesh_wireframe(
cd_edge_crease_offset = CustomData_get_offset(&bm->edata, CD_CREASE);
}
BM_mesh_elem_index_ensure(bm, BM_VERT);
BM_ITER_MESH_INDEX (v_src, &iter, bm, BM_VERTS_OF_MESH, i) {
BM_elem_flag_disable(v_src, BM_ELEM_TAG);
BM_elem_index_set(v_src, i); /* set_inline */
verts_src[i] = v_src;
BM_elem_flag_disable(v_src, BM_ELEM_TAG);
}
bm->elem_index_dirty &= ~BM_VERT;
/* setup tags, all faces and verts will be tagged which will be duplicated */
BM_ITER_MESH (f_src, &iter, bm, BM_FACES_OF_MESH) {
BM_ITER_MESH_INDEX (f_src, &iter, bm, BM_FACES_OF_MESH, i) {
BM_elem_index_set(f_src, i); /* set_inline */
if (use_tag) {
if (!BM_elem_flag_test(f_src, BM_ELEM_TAG)) {
@@ -256,6 +258,7 @@ void BM_mesh_wireframe(
BM_elem_flag_set(l->e, BM_ELEM_TAG, bm_loop_is_radial_boundary(l));
}
}
bm->elem_index_dirty &= ~BM_FACE;
/* duplicate tagged verts */
for (i = 0; i < totvert_orig; i++) {