[Bf-blender-cvs] [a5a0bc33a5f] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: a5a0bc33a5ff14645ddaa43f634b74d6329def78
Author: Antonio Vazquez
Date:   Sun Jul 15 16:59:04 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBa5a0bc33a5ff14645ddaa43f634b74d6329def78

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/editors/render/render_opengl.c
index fccdea78367,1b8d8cf7af2..4444dcde1ca
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@@ -326,10 -326,10 +326,10 @@@ static void screen_opengl_render_doit(c
  			GPU_clear(GPU_COLOR_BIT | GPU_DEPTH_BIT);
  
  			wmOrtho2(0, sizex, 0, sizey);
- 			gpuTranslate2f(sizex / 2, sizey / 2);
+ 			GPU_matrix_translate_2f(sizex / 2, sizey / 2);
  
  			G.f |= G_RENDER_OGL;
 -			ED_gpencil_draw_ex(scene, gpd, sizex, sizey, scene->r.cfra, SPACE_SEQ);
 +			ED_gpencil_draw_ex(rv3d, scene, gpd, sizex, sizey, scene->r.cfra, SPACE_SEQ);
  			G.f &= ~G_RENDER_OGL;
  
  			gp_rect = MEM_mallocN(sizex * sizey * sizeof(unsigned char) * 4, "offscreen rect");
diff --cc source/blender/editors/space_view3d/view3d_gizmo_ruler.c
index 98efa3cf368,db7ba040b3b..eeb4df2ac78
--- a/source/blender/editors/space_view3d/view3d_gizmo_ruler.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_ruler.c
@@@ -384,13 -380,11 +384,13 @@@ static bool view3d_ruler_item_mousemove
   * \{ */
  
  #define RULER_ID "RulerData3D"
- static bool view3d_ruler_to_gpencil(bContext *C, wmGizmoGroup *mgroup)
+ static bool view3d_ruler_to_gpencil(bContext *C, wmGizmoGroup *gzgroup)
  {
- 	// RulerInfo *ruler_info = mgroup->customdata;
+ 	// RulerInfo *ruler_info = gzgroup->customdata;
  	Main *bmain = CTX_data_main(C);
  	Scene *scene = CTX_data_scene(C);
 +
 +	bGPdata *gpd;
  	bGPDlayer *gpl;
  	bGPDframe *gpf;
  	bGPDstroke *gps;