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

[Campbell Barton]

Commit: 9bd40cbce17fdc6368814f7cdeaef9bca3fcb7e5
Author: Campbell Barton
Date:   Wed Sep 27 11:18:23 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB9bd40cbce17fdc6368814f7cdeaef9bca3fcb7e5

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/gpencil/drawgpencil.c
index 96f9959af02,c08ed0db400..63c15744388
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@@ -1701,11 -1731,11 +1701,11 @@@ void ED_gpencil_draw_view3d(wmWindowMan
  	if ((rv3d->persp == RV3D_CAMOB) && !(G.f & G_RENDER_OGL)) {
  		rctf rectf;
  		ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, &rectf, true); /* no shift */
 -		
 +
- 		offsx = iroundf(rectf.xmin);
- 		offsy = iroundf(rectf.ymin);
- 		winx  = iroundf(rectf.xmax - rectf.xmin);
- 		winy  = iroundf(rectf.ymax - rectf.ymin);
+ 		offsx = round_fl_to_int(rectf.xmin);
+ 		offsy = round_fl_to_int(rectf.ymin);
+ 		winx  = round_fl_to_int(rectf.xmax - rectf.xmin);
+ 		winy  = round_fl_to_int(rectf.ymax - rectf.ymin);
  	}
  	else {
  		offsx = 0;