Merge branch 'master' into blender2.8
[blender.git] / source / blender / bmesh / intern / bmesh_mesh_conv.c
index 6cc1f37db439d337fad170085620cd9713320106..fd32119cb5fa9f22d5d99ddc741cc278377c48b5 100644 (file)
@@ -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;