diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-25 13:06:17 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-25 13:06:17 +0400 |
| commit | b366813e37088e96539bf1f9b76ec8b33cb5cd72 (patch) | |
| tree | b1be19dece8e8c4c7e7909c76c3fc83f100b11d4 /source/blender/bmesh/intern/bmesh_polygon.c | |
| parent | c955272ec52c59bf0e432609b21c40c048fd6e53 (diff) | |
bugfix
* ntreeCompositExecTree accessed 'ntree' before NULL check.
* BM_face_triangulate accessed 'f' before NULL check.
also quiet warning in BKE_text_to_curve() and add a check for BMesh bridge loops so it knows quicker if it can copy loop data or not.
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_polygon.c')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_polygon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c index 79d229aec1b..19b13a00f6d 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.c +++ b/source/blender/bmesh/intern/bmesh_polygon.c @@ -861,13 +861,13 @@ void BM_face_triangulate(BMesh *bm, BMFace *f, float (*projectverts)[3], f = BM_face_split(bm, l_iter->f, l_iter->prev->v, l_iter->next->v, &newl, NULL); - copy_v3_v3(f->no, l_iter->f->no); - if (!f) { + if (UNLIKELY(!f)) { fprintf(stderr, "%s: triangulator failed to split face! (bmesh internal error)\n", __func__); break; } + copy_v3_v3(f->no, l_iter->f->no); BMO_elem_flag_enable(bm, newl->e, newedge_oflag); BMO_elem_flag_enable(bm, f, newface_oflag); |