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/collada | |
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/collada')
-rw-r--r-- | source/blender/collada/collada_utils.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index 945dda68745..cb4ee62f636 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -449,7 +449,8 @@ void bc_triangulate_mesh(Mesh *me) BM_mesh_triangulate(bm, quad_method, use_beauty, tag_only, NULL, NULL, NULL); BMeshToMeshParams bm_to_me_params = {0}; - BM_mesh_bm_to_me(bm, me, &bm_to_me_params); + bm_to_me_params.calc_object_remap = false; + BM_mesh_bm_to_me(NULL, bm, me, &bm_to_me_params); BM_mesh_free(bm); } |