diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-13 17:42:56 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-13 17:42:56 +0300 |
| commit | 4943739b89c010f08ddcc7bc02bf04acf7f0bc8d (patch) | |
| tree | 38674282286ec72693929b481d9aa3643da8b746 /source/blender/blenkernel/intern/mesh.c | |
| parent | b8015ece51c22224265c55196eff61a8f33d7239 (diff) | |
| parent | f61c30f804e36bf00e7124514f02bbee42e0197d (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh_utils.c
source/blenderplayer/bad_level_call_stubs/stubs.c
Diffstat (limited to 'source/blender/blenkernel/intern/mesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index b325d8d02d9..e83f2d92dd9 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -728,8 +728,9 @@ BMesh *BKE_mesh_to_bmesh( Mesh *BKE_bmesh_to_mesh_nomain(BMesh *bm, const struct BMeshToMeshParams *params) { + BLI_assert(params->calc_object_remap == false); Mesh *mesh = BKE_id_new_nomain(ID_ME, NULL); - BM_mesh_bm_to_me(bm, mesh, params); + BM_mesh_bm_to_me(NULL, bm, mesh, params); return mesh; } |