[Bf-blender-cvs] [c45b8a65b43] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: c45b8a65b4311babc92fd3d794db0ec9248fb316
Author: Campbell Barton
Date:   Fri Oct 20 14:14:44 2017 +1100
Branches: blender2.8
https://developer.blender.org/rBc45b8a65b4311babc92fd3d794db0ec9248fb316

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/editors/gpencil/drawgpencil.c
index 659c0c99fcb,100e2dc8295..1b6261a6bef
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@@ -456,12 -421,12 +456,12 @@@ static void gp_triangulate_stroke_fill(
  	gps->tot_triangles = gps->totpoints - 2;
  	unsigned int (*tmp_triangles)[3] = MEM_mallocN(sizeof(*tmp_triangles) * gps->tot_triangles, "GP Stroke temp triangulation");
  	float (*points2d)[2] = MEM_mallocN(sizeof(*points2d) * gps->totpoints, "GP Stroke temp 2d points");
 -	
 +
  	int direction = 0;
 -	
 +
  	/* convert to 2d and triangulate */
  	gp_stroke_2d_flat(gps->points, gps->totpoints, points2d, &direction);
- 	BLI_polyfill_calc((const float(*)[2])points2d, (unsigned int)gps->totpoints, direction, (unsigned int(*)[3])tmp_triangles);
+ 	BLI_polyfill_calc(points2d, (unsigned int)gps->totpoints, direction, tmp_triangles);
  
  	/* Number of triangles */
  	gps->tot_triangles = gps->totpoints - 2;
diff --cc source/blender/editors/uvedit/uvedit_draw.c
index 1e557236bfd,fecacd07997..100c30459e9
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@@ -215,9 -201,9 +215,9 @@@ static void draw_uvs_stretch(SpaceImag
  				uv_poly_copy_aspect(tf_uvorig, tf_uv, aspx, aspy, efa->len);
  
  				totarea += BM_face_calc_area(efa);
- 				totuvarea += area_poly_v2((const float (*)[2])tf_uv, efa->len);
+ 				totuvarea += area_poly_v2(tf_uv, efa->len);
  				
 -				if (uvedit_face_visible_test(scene, ima, efa, tf)) {
 +				if (uvedit_face_visible_test(scene, ima, efa)) {
  					BM_elem_flag_enable(efa, BM_ELEM_TAG);
  				}
  				else {