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

[Antonio Vazquez]

Commit: 69dfaeb96ebeb03ed1d34a1c110cccae57f7cf39
Author: Antonio Vazquez
Date:   Mon Mar 26 10:40:29 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB69dfaeb96ebeb03ed1d34a1c110cccae57f7cf39

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	source/blender/draw/intern/DRW_render.h
	source/blender/draw/intern/draw_manager_framebuffer.c

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



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

diff --cc source/blender/draw/intern/draw_manager.c
index 9dedb11e530,2b64eabe332..7f2d76fea2b
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@@ -1460,17 -1365,9 +1471,7 @@@ void DRW_render_to_image(RenderEngine *
  	/* Force cache to reset. */
  	drw_viewport_cache_resize();
  
 -	/* TODO grease pencil */
 -
  	GPU_viewport_free(DST.viewport);
- 
- 	DRW_state_reset();
- 	/* FIXME GL_DEPTH_TEST is enabled by default but it seems
- 	 * to trigger some bad behaviour / artifacts if it's turned
- 	 * on at this point. */
- 	glDisable(GL_DEPTH_TEST);
- 
- 	/* Restore Drawing area. */
- 	gpuPopAttrib();
- 	glEnable(GL_SCISSOR_TEST);
  	GPU_framebuffer_restore();
  
  	/* Changing Context */