Merge branch 'master' into blender2.8

2017-10-20 14:14:44 +11:00
parent aa7e76b2e3 959a58da9e
commit c45b8a65b4
12 changed files with 25 additions and 25 deletions
--- a/source/blender/python/mathutils/mathutils_bvhtree.c
+++ b/source/blender/python/mathutils/mathutils_bvhtree.c
@@ -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--) {