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/blenlib | |
parent | aa7e76b2e35c6ff6c58ccd4373b68dde8283a3a3 (diff) | |
parent | 959a58da9e4d23be2738b6979ec208f05468f50c (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/intern/convexhull2d.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenlib/intern/convexhull2d.c b/source/blender/blenlib/intern/convexhull2d.c index 740f3cce4a4..1f1f214ce32 100644 --- a/source/blender/blenlib/intern/convexhull2d.c +++ b/source/blender/blenlib/intern/convexhull2d.c @@ -209,7 +209,7 @@ int BLI_convexhull_2d(const float (*points)[2], const int n, int r_points[]) memcpy(points_sort[i], points_ref[i].pt, sizeof(float[2])); } - tot = BLI_convexhull_2d_sorted((const float (*)[2])points_sort, n, r_points); + tot = BLI_convexhull_2d_sorted(points_sort, n, r_points); /* map back to the original index values */ points_map = (int *)points_sort; /* abuse float array for temp storage */ @@ -305,7 +305,7 @@ float BLI_convexhull_aabb_fit_points_2d(const float (*points)[2], unsigned int n index_map = MEM_mallocN(sizeof(*index_map) * n * 2, __func__); - tot = BLI_convexhull_2d((const float (*)[2])points, (int)n, index_map); + tot = BLI_convexhull_2d(points, (int)n, index_map); if (tot) { float (*points_hull)[2]; @@ -316,7 +316,7 @@ float BLI_convexhull_aabb_fit_points_2d(const float (*points)[2], unsigned int n copy_v2_v2(points_hull[j], points[index_map[j]]); } - angle = BLI_convexhull_aabb_fit_hull_2d((const float (*)[2])points_hull, (unsigned int)tot); + angle = BLI_convexhull_aabb_fit_hull_2d(points_hull, (unsigned int)tot); MEM_freeN(points_hull); } else { |