diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-10-20 06:14:44 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-20 06:14:44 +0300 |
commit | c45b8a65b4311babc92fd3d794db0ec9248fb316 (patch) | |
tree | a59c095aa17a409cd06158a9cc186848e012b896 /source/blender/blenkernel/intern | |
parent | aa7e76b2e35c6ff6c58ccd4373b68dde8283a3a3 (diff) | |
parent | 959a58da9e4d23be2738b6979ec208f05468f50c (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/mesh_evaluate.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh_mapping.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh_remap.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c index 4a1952c798b..c21c16adc85 100644 --- a/source/blender/blenkernel/intern/mesh_evaluate.c +++ b/source/blender/blenkernel/intern/mesh_evaluate.c @@ -2597,7 +2597,7 @@ int BKE_mesh_recalc_tessellation( mul_v2_m3v3(projverts[j], axis_mat, mvert[ml->v].co); } - BLI_polyfill_calc_arena((const float (*)[2])projverts, mp_totloop, 1, tris, arena); + BLI_polyfill_calc_arena(projverts, mp_totloop, 1, tris, arena); /* apply fill */ for (j = 0; j < totfilltri; j++) { @@ -2796,7 +2796,7 @@ void BKE_mesh_recalc_looptri( mul_v2_m3v3(projverts[j], axis_mat, mvert[ml->v].co); } - BLI_polyfill_calc_arena((const float (*)[2])projverts, mp_totloop, 1, tris, arena); + BLI_polyfill_calc_arena(projverts, mp_totloop, 1, tris, arena); /* apply fill */ for (j = 0; j < totfilltri; j++) { diff --git a/source/blender/blenkernel/intern/mesh_mapping.c b/source/blender/blenkernel/intern/mesh_mapping.c index 525c0c9728e..0143125490e 100644 --- a/source/blender/blenkernel/intern/mesh_mapping.c +++ b/source/blender/blenkernel/intern/mesh_mapping.c @@ -117,7 +117,7 @@ UvVertMap *BKE_mesh_uv_vert_map_create( } if (use_winding) { - winding[a] = cross_poly_v2((const float (*)[2])tf_uv, (unsigned int)nverts) > 0; + winding[a] = cross_poly_v2(tf_uv, (unsigned int)nverts) > 0; } } } diff --git a/source/blender/blenkernel/intern/mesh_remap.c b/source/blender/blenkernel/intern/mesh_remap.c index d2fe8f27f4a..b0580f75044 100644 --- a/source/blender/blenkernel/intern/mesh_remap.c +++ b/source/blender/blenkernel/intern/mesh_remap.c @@ -2169,7 +2169,7 @@ void BKE_mesh_remap_calc_polys_from_dm( tri_vidx_2d[1][2] = 3; } else { - BLI_polyfill_calc((const float(*)[2])poly_vcos_2d, (unsigned int)mp->totloop, -1, + BLI_polyfill_calc(poly_vcos_2d, (unsigned int)mp->totloop, -1, (unsigned int (*)[3])tri_vidx_2d); } |