Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / scene.c
index 12aaa4e..7e161a8 100644 (file)
@@ -1322,7 +1322,7 @@ static void prepare_mesh_for_viewport_render(
                        if (check_rendered_viewport_visible(bmain)) {
                                BMesh *bm = mesh->edit_btmesh->bm;
                                BM_mesh_bm_to_me(
-                                       bm, mesh,
+                                       bmain, bm, mesh,
                                        (&(struct BMeshToMeshParams){
                                            .calc_object_remap = true,
                                        }));