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/modifiers/intern/MOD_edgesplit.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/modifiers/intern/MOD_edgesplit.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_edgesplit.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c index e8ffddbde4e..e1806dc8283 100644 --- a/source/blender/modifiers/intern/MOD_edgesplit.c +++ b/source/blender/modifiers/intern/MOD_edgesplit.c @@ -107,8 +107,7 @@ static Mesh *doEdgeSplit(Mesh *mesh, EdgeSplitModifierData *emd, const ModifierE /* BM_mesh_validate(bm); */ /* for troubleshooting */ - result = BKE_id_new_nomain(ID_ME, mesh->id.name); - BM_mesh_bm_to_me(bm, result, &((struct BMeshToMeshParams){0})); + result = BKE_bmesh_to_mesh_nomain(bm, &((struct BMeshToMeshParams){0})); BM_mesh_free(bm); result->runtime.cd_dirty_vert |= CD_MASK_NORMAL; |