archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2017-10-20 14:14:44 +11:00
parent aa7e76b2e3 959a58da9e
commit c45b8a65b4
12 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/python/mathutils/mathutils_bvhtree.c
View File

@@ -872,7 +872,7 @@ static PyObject *C_BVHTree_FromPolygons(PyObject *UNUSED(cls), PyObject *args, P
mul_v2_m3v3(proj_coords[j], axis_mat, coords[plink->poly[j]]);
}
BLI_polyfill_calc_arena((const float (*)[2])proj_coords, plink->len, 1, tris_offset, pf_arena);
BLI_polyfill_calc_arena(proj_coords, plink->len, 1, tris_offset, pf_arena);
j = plink->len - 2;
while (j--) {

4
source/blender/python/mathutils/mathutils_geometry.c
View File

@@ -1430,7 +1430,7 @@ static PyObject *M_Geometry_box_fit_2d(PyObject *UNUSED(self), PyObject *pointli
if (len) {
/* Non Python function */
angle = BLI_convexhull_aabb_fit_points_2d((const float (*)[2])points, len);
angle = BLI_convexhull_aabb_fit_points_2d(points, len);
PyMem_Free(points);
}
@@ -1468,7 +1468,7 @@ static PyObject *M_Geometry_convex_hull_2d(PyObject *UNUSED(self), PyObject *poi
index_map = MEM_mallocN(sizeof(*index_map) * len * 2, __func__);
/* Non Python function */
len_ret = BLI_convexhull_2d((const float (*)[2])points, len, index_map);
len_ret = BLI_convexhull_2d(points, len, index_map);
ret = PyList_New(len_ret);
for (i = 0; i < len_ret; i++) {