diff options
| author | Germano Cavalcante <germano.costa@ig.com.br> | 2020-07-30 01:19:25 +0300 |
|---|---|---|
| committer | Germano Cavalcante <germano.costa@ig.com.br> | 2020-07-30 01:19:25 +0300 |
| commit | 2181028292432a24bf020e0442fb804f44c62551 (patch) | |
| tree | 4254cf0653986f473e5268618710814b9319d27c | |
| parent | 486c7b87fb06bf6c9e3c15166751d8b987d7f00f (diff) | |
| parent | 699cefefd0093e12ca15c5430f73725e9f0d0113 (diff) | |
Merge branch 'blender-v2.90-release'
| -rw-r--r-- | source/blender/editors/transform/transform_convert_mesh.c | 11 | ||||
| -rw-r--r-- | tests/python/CMakeLists.txt | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/source/blender/editors/transform/transform_convert_mesh.c b/source/blender/editors/transform/transform_convert_mesh.c index 451903f1857..e4960e1ec71 100644 --- a/source/blender/editors/transform/transform_convert_mesh.c +++ b/source/blender/editors/transform/transform_convert_mesh.c @@ -1094,10 +1094,11 @@ static BMFace *mesh_customdatacorrect_face_substitute_get(BMFace *f_copy) #endif /* USE_FACE_SUBSTITUTE */ static void mesh_customdatacorrect_init_vert(struct TransCustomDataLayer *tcld, - BMVert *v, + struct TransDataBasic *td, const int index) { BMesh *bm = tcld->bm; + BMVert *v = td->extra; BMIter liter; int j, l_num; float *loop_weights; @@ -1149,7 +1150,7 @@ static void mesh_customdatacorrect_init_vert(struct TransCustomDataLayer *tcld, merge_data->cd_loop_groups = NULL; } - BLI_ghash_insert(tcld->merge_group.origverts, v, merge_data); + BLI_ghash_insert(tcld->merge_group.origverts, v, td); } } @@ -1243,14 +1244,12 @@ static void mesh_customdatacorrect_init_container(TransDataContainer *tc, TransData *tob = tc->data; for (int j = tc->data_len; j--; tob++, i++) { - BMVert *v = tob->extra; - mesh_customdatacorrect_init_vert(tcld, v, i); + mesh_customdatacorrect_init_vert(tcld, (TransDataBasic *)tob, i); } TransDataMirror *td_mirror = tc->data_mirror; for (int j = tc->data_mirror_len; j--; td_mirror++, i++) { - BMVert *v = td_mirror->extra; - mesh_customdatacorrect_init_vert(tcld, v, i); + mesh_customdatacorrect_init_vert(tcld, (TransDataBasic *)td_mirror, i); } } diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index a3df01fdbe2..1b78a938a04 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -337,7 +337,7 @@ add_blender_test( --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py -- --run={'FINISHED'}&bpy.ops.export_mesh.ply\(filepath='${TEST_OUT_DIR}/io_tests/export_ply_vertices.ply'\) --md5_source=${TEST_OUT_DIR}/io_tests/export_ply_vertices.ply - --md5=37faba0aa2014451b27f951afa92f870 --md5_method=FILE + --md5=ee6ce2e69c1d9a7418ff0548f6338f70 --md5_method=FILE ) |