diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-19 09:46:42 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-19 09:46:42 +0300 |
| commit | 264691e5630fcd11516272c98bcdf2a2c980dfa3 (patch) | |
| tree | dd4e72696dc2c9f4ff478339ccca8cf714eb1e03 /source/blender/bmesh/intern/bmesh_mesh_conv.c | |
| parent | 34e76c7162de721e73262efe138ac28f74936eec (diff) | |
| parent | 860939ccc2c11f0503588d35e2b23326997c9768 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_mesh_conv.c')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh_conv.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c index 6cc1f37db43..fd32119cb5f 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_conv.c +++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c @@ -708,7 +708,7 @@ void BM_mesh_bm_to_me( } /* patch hook indices and vertex parents */ - if (ototvert > 0) { + if (params->calc_object_remap && (ototvert > 0)) { Object *ob; ModifierData *md; BMVert **vertMap = NULL; @@ -765,11 +765,7 @@ void BM_mesh_bm_to_me( if (vertMap) MEM_freeN(vertMap); } - if (params->calc_tessface) { - BKE_mesh_tessface_calc(me); - } - - BKE_mesh_update_customdata_pointers(me, params->calc_tessface); + BKE_mesh_update_customdata_pointers(me, false); { BMEditSelection *selected; |