[Bf-blender-cvs] [76b479f99d9] temp-lanpr-cleanup: Cleanup: Fix merge problems.

[YimingWu]

Commit: 76b479f99d98c7e9a4cc8891e36f42f3a825c61c
Author: YimingWu
Date:   Fri Sep 27 13:53:40 2019 +0800
Branches: temp-lanpr-cleanup
https://developer.blender.org/rB76b479f99d98c7e9a4cc8891e36f42f3a825c61c

Cleanup: Fix merge problems.

===================================================================

M	source/blender/blenkernel/intern/mesh_remesh_voxel.c
M	source/blender/blenkernel/intern/mirror.c

===================================================================

diff --git a/source/blender/blenkernel/intern/mesh_remesh_voxel.c b/source/blender/blenkernel/intern/mesh_remesh_voxel.c
index 92e180601d7..13b990e6510 100644
--- a/source/blender/blenkernel/intern/mesh_remesh_voxel.c
+++ b/source/blender/blenkernel/intern/mesh_remesh_voxel.c
@@ -447,8 +447,7 @@ struct Mesh *BKE_mesh_remesh_voxel_fix_poles(struct Mesh *mesh)
   Mesh *result = BKE_mesh_from_bmesh_nomain(bm,
                                             (&(struct BMeshToMeshParams){
                                                 .calc_object_remap = false,
-                                            }),
-                                            mesh);
+                                            }));
 
   BKE_id_free(NULL, mesh);
   BM_mesh_free(bm);
diff --git a/source/blender/blenkernel/intern/mirror.c b/source/blender/blenkernel/intern/mirror.c
index c429b953015..57a9daab441 100644
--- a/source/blender/blenkernel/intern/mirror.c
+++ b/source/blender/blenkernel/intern/mirror.c
@@ -91,7 +91,7 @@ Mesh *BKE_mirror_bisect_on_mirror_plane(MirrorModifierData *mmd,
     }
   }
 
-  result = BKE_mesh_from_bmesh_for_eval_nomain(bm, NULL, mesh);
+  result = BKE_mesh_from_bmesh_for_eval_nomain(bm, NULL);
   BM_mesh_free(bm);
 
   return result;