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

[Antonio Vazquez]

Commit: a556f170f775dd16b91f6865d53c23cfb517459f
Author: Antonio Vazquez
Date:   Thu Feb 15 09:31:51 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBa556f170f775dd16b91f6865d53c23cfb517459f

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	source/blender/draw/intern/draw_manager.c

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



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

diff --cc source/blender/draw/intern/draw_manager.c
index 900e09e0653,622fbe968d2..10688e5fc60
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@@ -3732,15 -3648,9 +3693,18 @@@ void DRW_render_to_image(RenderEngine *
  		engine_type->draw_engine->render_to_image(data, re, depsgraph);
  	}
  
+ 	DST.buffer_finish_called = false;
+ 
+ 	/* TODO grease pencil */
 +	/* grease pencil 
 +	 * the grease pencil render result is merged in the previous render result.
 +	 */
 +	if (draw_engine_gpencil_type.render_to_image) {
 +		if (DRW_render_check_object_type(depsgraph, OB_GPENCIL)) {
 +			ViewportEngineData *gpdata = DRW_viewport_engine_data_ensure(&draw_engine_gpencil_type);
 +			draw_engine_gpencil_type.render_to_image(gpdata, re, depsgraph);
 +		}
 +	}
  
  	GPU_viewport_free(DST.viewport);
  	MEM_freeN(DST.viewport);