diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-18 12:11:08 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-18 12:11:08 +0400 |
| commit | c776418b247f9a34dec22c15684bcece5db568b7 (patch) | |
| tree | 28583df006ef8812f2671de9f34d230b32b59dc5 /source/blender/bmesh | |
| parent | 08478a10d168390808584c5cdebcb56566e07a7c (diff) | |
add missing NULL check for BM_vert_collapse_faces(), could crash in rare cases.
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mods.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index 71f120c5217..20306d3bd4a 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -544,7 +544,7 @@ BMEdge *BM_vert_collapse_faces(BMesh *bm, BMEdge *ke, BMVert *kv, float fac, ne = bmesh_jekv(bm, ke, kv, TRUE); /* ne = BM_edge_exists(tv, tv2); */ /* same as return above */ - if (kill_degenerate_faces) { + if (ne && kill_degenerate_faces) { BLI_array_declare(bad_faces); BMFace **bad_faces = NULL; |