diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2011-05-10 01:55:15 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2011-05-10 01:55:15 +0400 |
| commit | 8a3ea7859857e42169505da918cf061d4b60ec4c (patch) | |
| tree | 04af9901898eff95a19528690e8d95a57b6bbee6 /source | |
| parent | 7798666091124d249786ef3679030db0fcee6690 (diff) | |
=bmesh= fixed dissolve verts crash
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_newcore.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/bmesh/intern/bmesh_newcore.c b/source/blender/bmesh/intern/bmesh_newcore.c index 475dfedc819..eebd63fc5c4 100644 --- a/source/blender/bmesh/intern/bmesh_newcore.c +++ b/source/blender/bmesh/intern/bmesh_newcore.c @@ -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*/ |