Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / scene.c
index 932f80c35d523c1858461cb32693626fb24f589f..899a911270f0383cd2fb8fbc671f91f4a7f552fa 100644 (file)
@@ -1396,7 +1396,11 @@ static void prepare_mesh_for_viewport_render(Main *bmain, const EvaluationContex
                {
                        if (check_rendered_viewport_visible(bmain)) {
                                BMesh *bm = mesh->edit_btmesh->bm;
-                               BM_mesh_bm_to_me(bm, mesh, (&(struct BMeshToMeshParams){0}));
+                               BM_mesh_bm_to_me(
+                                       bm, mesh,
+                                       (&(struct BMeshToMeshParams){
+                                           .calc_object_remap = true,
+                                       }));
                                DEG_id_tag_update(&mesh->id, 0);
                        }
                }