diff options
Diffstat (limited to 'source/blender/blenkernel/intern/data_transfer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/data_transfer.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c index e6afca11b40..8de22195674 100644 --- a/source/blender/blenkernel/intern/data_transfer.c +++ b/source/blender/blenkernel/intern/data_transfer.c @@ -257,7 +257,7 @@ static void data_transfer_dtdata_type_preprocess(Mesh *me_src, if (dtdata_type == DT_TYPE_LNOR) { /* Compute custom normals into regular loop normals, which will be used for the transfer. */ - const MVert *verts_dst = BKE_mesh_verts(me_dst); + const float(*positions_dst)[3] = BKE_mesh_positions(me_dst); const int num_verts_dst = me_dst->totvert; const MEdge *edges_dst = BKE_mesh_edges(me_dst); const int num_edges_dst = me_dst->totedge; @@ -286,7 +286,7 @@ static void data_transfer_dtdata_type_preprocess(Mesh *me_src, CustomData_set_layer_flag(ldata_dst, CD_NORMAL, CD_FLAG_TEMPORARY); } if (dirty_nors_dst || do_loop_nors_dst) { - BKE_mesh_normals_loop_split(verts_dst, + BKE_mesh_normals_loop_split(positions_dst, BKE_mesh_vertex_normals_ensure(me_dst), num_verts_dst, edges_dst, @@ -319,7 +319,7 @@ static void data_transfer_dtdata_type_postprocess(Object *UNUSED(ob_src), } /* Bake edited destination loop normals into custom normals again. */ - const MVert *verts_dst = BKE_mesh_verts(me_dst); + const float(*positions_dst)[3] = BKE_mesh_positions(me_dst); const int num_verts_dst = me_dst->totvert; MEdge *edges_dst = BKE_mesh_edges_for_write(me_dst); const int num_edges_dst = me_dst->totedge; @@ -339,7 +339,7 @@ static void data_transfer_dtdata_type_postprocess(Object *UNUSED(ob_src), } /* Note loop_nors_dst contains our custom normals as transferred from source... */ - BKE_mesh_normals_loop_custom_set(verts_dst, + BKE_mesh_normals_loop_custom_set(positions_dst, BKE_mesh_vertex_normals_ensure(me_dst), num_verts_dst, edges_dst, @@ -927,7 +927,7 @@ static bool data_transfer_layersmapping_generate(ListBase *r_map, } if (cddata_type == CD_FAKE_SHAPEKEY) { /* TODO: leaving shape-keys aside for now, quite specific case, - * since we can't access them from #MVert :/ */ + * since we can't access them from mesh vertices :/ */ return false; } } @@ -1309,7 +1309,7 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph, } BKE_mesh_remap_find_best_match_from_mesh( - BKE_mesh_verts(me_dst), me_dst->totvert, me_src, space_transform); + BKE_mesh_positions(me_dst), me_dst->totvert, me_src, space_transform); } /* Check all possible data types. @@ -1337,7 +1337,7 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph, } if (DT_DATATYPE_IS_VERT(dtdata_type)) { - MVert *verts_dst = BKE_mesh_verts_for_write(me_dst); + float(*positions_dst)[3] = BKE_mesh_positions_for_write(me_dst); const int num_verts_dst = me_dst->totvert; if (!geom_map_init[VDATA]) { @@ -1376,7 +1376,7 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph, space_transform, max_distance, ray_radius, - verts_dst, + positions_dst, num_verts_dst, dirty_nors_dst, me_src, @@ -1419,7 +1419,7 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph, } } if (DT_DATATYPE_IS_EDGE(dtdata_type)) { - const MVert *verts_dst = BKE_mesh_verts_for_write(me_dst); + const float(*positions_dst)[3] = BKE_mesh_positions_for_write(me_dst); const int num_verts_dst = me_dst->totvert; const MEdge *edges_dst = BKE_mesh_edges(me_dst); const int num_edges_dst = me_dst->totedge; @@ -1453,7 +1453,7 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph, space_transform, max_distance, ray_radius, - verts_dst, + positions_dst, num_verts_dst, edges_dst, num_edges_dst, @@ -1498,7 +1498,7 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph, } } if (DT_DATATYPE_IS_LOOP(dtdata_type)) { - const MVert *verts_dst = BKE_mesh_verts(me_dst); + const float(*positions_dst)[3] = BKE_mesh_positions(me_dst); const int num_verts_dst = me_dst->totvert; const MEdge *edges_dst = BKE_mesh_edges(me_dst); const int num_edges_dst = me_dst->totedge; @@ -1540,7 +1540,7 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph, max_distance, ray_radius, me_dst, - verts_dst, + positions_dst, num_verts_dst, edges_dst, num_edges_dst, @@ -1593,7 +1593,7 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph, } } if (DT_DATATYPE_IS_POLY(dtdata_type)) { - const MVert *verts_dst = BKE_mesh_verts(me_dst); + const float(*positions_dst)[3] = BKE_mesh_positions(me_dst); const int num_verts_dst = me_dst->totvert; const MPoly *polys_dst = BKE_mesh_polys(me_dst); const int num_polys_dst = me_dst->totpoly; @@ -1630,7 +1630,7 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph, max_distance, ray_radius, me_dst, - verts_dst, + positions_dst, loops_dst, polys_dst, num_polys_dst, |