[Bf-blender-cvs] [f010d2ef276] greasepencil-object: Merge branch 'greasepencil-object' of git.blender.org:blender into greasepencil-object

[Antonio Vazquez]

Commit: f010d2ef2761bfd66bc177ed0844bcf8657e3baa
Author: Antonio Vazquez
Date:   Tue May 8 18:08:42 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBf010d2ef2761bfd66bc177ed0844bcf8657e3baa

Merge branch 'greasepencil-object' of git.blender.org:blender into greasepencil-object

 Conflicts:
	source/blender/draw/engines/gpencil/gpencil_engine.c

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



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

diff --cc source/blender/draw/engines/gpencil/gpencil_engine.c
index b8414236d7c,8761b9acf96..63b6bd028f4
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@@ -927,10 -928,6 +927,8 @@@ static void GPENCIL_render_to_image(voi
  	GPENCIL_engine_init(vedata);
  	GPENCIL_render_init(vedata, engine, draw_ctx->depsgraph);
  
- 	/* depth of field */
- 	Object *camera = DEG_get_evaluated_object(draw_ctx->depsgraph, RE_GetCamera(engine->re));
 +	GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
 +
  	GPENCIL_FramebufferList *fbl = ((GPENCIL_Data *)vedata)->fbl;
  	if (fbl->main) {
  		GPU_framebuffer_texture_attach(fbl->main, e_data.render_depth_tx, 0, 0);