diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-06-03 03:20:49 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-06-03 03:20:49 +0400 |
| commit | dfad9b0c09eed2de2c3bedd64691bf11f637725c (patch) | |
| tree | 86298761e9883ca7dc83b3b5a24a859bdd07bfce /source/blender/bmesh/intern/bmesh_mesh_conv.c | |
| parent | 99b55ef6eb7d677ead66b4166afe45688147a5b3 (diff) | |
fix [#35555] Collada: export destroys mesh in some cases
add arguments to calculate normals when converting to bmesh:
BM_mesh_bm_from_me, DM_to_bmesh
This gives some speedup to undo (which didnt need to re-calculate vertex normals), and array modifier which doesnt need to calculate face normals at all
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_mesh_conv.c')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh_conv.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c index 6d1db98f32e..9d330075a3a 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_conv.c +++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c @@ -185,7 +185,8 @@ static BMFace *bm_face_create_from_mpoly(MPoly *mp, MLoop *ml, * * \warning This function doesn't calculate face normals. */ -void BM_mesh_bm_from_me(BMesh *bm, Mesh *me, bool set_key, int act_key_nr) +void BM_mesh_bm_from_me(BMesh *bm, Mesh *me, + const bool calc_face_normal, const bool set_key, int act_key_nr) { MVert *mvert; MEdge *medge; @@ -397,6 +398,10 @@ void BM_mesh_bm_from_me(BMesh *bm, Mesh *me, bool set_key, int act_key_nr) /* Copy Custom Data */ CustomData_to_bmesh_block(&me->pdata, &bm->pdata, i, &f->head.data, true); + + if (calc_face_normal) { + BM_face_normal_update(f); + } } bm->elem_index_dirty &= ~BM_FACE; /* added in order, clear dirty flag */ |