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

[Antonio Vazquez]

Commit: a12b8dbc403b5ad5a33015ce821612bb34bb06c9
Author: Antonio Vazquez
Date:   Wed Feb 21 10:39:13 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBa12b8dbc403b5ad5a33015ce821612bb34bb06c9

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/draw/intern/draw_manager.c
index 1ed501ff872,a3a59efc799..a7ad6b1e52f
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@@ -3719,11 -3662,9 +3719,13 @@@ void DRW_render_to_image(RenderEngine *
  			DST.draw_ctx.depsgraph = BKE_scene_get_depsgraph(scene, view_layer, true);
  
  			engine_type->draw_engine->render_to_image(data, engine, render_result, render_layer);
 +
 +			/* grease pencil: render result is merged in the previous render result. */
 +			DRW_render_gpencil_to_image(engine, render_result, render_layer);
 +
  			DST.buffer_finish_called = false;
+ 			/* Force cache to reset. */
+ 			drw_viewport_cache_resize();
  		}
  	}