tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Merge branch 'blender-v2.90-release'

This commit is contained in:
Germano Cavalcante 2020-07-29 19:19:25 -03:00
parent 486c7b87fb 699cefefd0
commit 2181028292
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/transform/transform_convert_mesh.c
View File

@ -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);
}
}

2
tests/python/CMakeLists.txt
View File

@ -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
)