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

=bmesh= fixed dissolve verts crash

Browse Source
This commit is contained in:
Joseph Eagar
2011-05-09 21:55:15 +00:00
parent 7798666091
commit 8a3ea78598
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -931,8 +931,9 @@ BMFace *BM_Join_Faces(BMesh *bm, BMFace **faces, int totface)
/*create region face*/
newf = BM_Make_Ngon(bm, v1, v2, edges, tote, 0);
if (!newf) {
err = "Invalid boundary region to join faces";
if (!newf || BMO_HasError(bm)) {
if (!BMO_HasError(bm))
err = "Invalid boundary region to join faces";
goto error;
}
@@ -965,7 +966,7 @@ BMFace *BM_Join_Faces(BMesh *bm, BMFace **faces, int totface)
l = l->next;
} while (l != bm_firstfaceloop(newf));
BM_Copy_Attributes(bm, bm, faces[0], newf);
/*add holes*/