kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix bug 30866: prevent 2-sided polygons from knife cuts.

Browse Source 
Blender bmesh code assumes there aren't any of those, so crashed
when trying to delete a vertex involved in one.
This commit is contained in:
Howard Trickey 2012-04-09 12:50:43 +00:00
parent b0b64b2d80
commit 25492d1e4c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/mesh/editmesh_knife.c
View File

@ -2397,7 +2397,12 @@ static void knife_make_chain_cut(knifetool_opdata *kcd, BMFace *f, ListBase *cha
BLI_assert(i == nco); BLI_assert(i == nco);
lnew = NULL; lnew = NULL;
if (nco == 0) { if (nco == 0) {
*newface = BM_face_split(bm, f, v1, v2, &lnew, NULL, TRUE); /* Want to prevent creating two-sided polygons */
if (BM_edge_exists(v1, v2)) {
*newface = NULL;
} else {
*newface = BM_face_split(bm, f, v1, v2, &lnew, NULL, TRUE);
}
} }
else { else {
fnew = BM_face_split_n(bm, f, v1, v2, cos, nco, &lnew, NULL); fnew = BM_face_split_n(bm, f, v1, v2, cos, nco, &lnew, NULL);
@ -2430,7 +2435,6 @@ static void knife_make_face_cuts(knifetool_opdata *kcd, BMFace *f, ListBase *kfe
while ((chain = find_chain(kcd, kfedges)) != NULL) { while ((chain = find_chain(kcd, kfedges)) != NULL) {
knife_make_chain_cut(kcd, f, chain, &fnew); knife_make_chain_cut(kcd, f, chain, &fnew);
if (!fnew) { if (!fnew) {
BLI_assert("!knife failed chain cut");
return; return;
} }