diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-03-12 12:50:02 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-12 12:50:02 +0400 |
commit | ee3d910f8f80b68c4090338c017e40175d14029d (patch) | |
tree | b90e5ac7ae24d6413c8497cb66d5f5b4d714abd0 /source/blender/bmesh | |
parent | d9960dba31cc028392665c3481e145450dc626da (diff) |
code cleanup: quiet struct gcc warnings, also use more conventional names for bmesh dissolve.
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r-- | source/blender/bmesh/tools/bmesh_decimate_dissolve.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c index 4be70b7f5e9..a5122b242be 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c +++ b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c @@ -114,14 +114,14 @@ void BM_mesh_decimate_dissolve_ex(BMesh *bm, const float angle_limit, const bool /* check twice because cumulative effect could dissolve over angle limit */ (BM_edge_calc_face_angle(e) < angle_limit)) { - BMFace *nf = BM_faces_join_pair(bm, e->l->f, - e->l->radial_next->f, - e, - false); /* join faces */ + BMFace *f_new = BM_faces_join_pair(bm, e->l->f, + e->l->radial_next->f, + e, + false); /* join faces */ /* there may be some errors, we don't mind, just move on */ - if (nf) { - BM_face_normal_update(nf); + if (f_new) { + BM_face_normal_update(f_new); } else { BMO_error_clear(bm); |