[Bf-blender-cvs] [c085593fcfe] temp-greasepencil-vfx: Merge branch 'greasepencil-object' into temp-greasepencil-vfx

[Antonio Vazquez]

Commit: c085593fcfe6f789d417464826858c8402a14b58
Author: Antonio Vazquez
Date:   Thu Jun 28 09:13:01 2018 +0200
Branches: temp-greasepencil-vfx
https://developer.blender.org/rBc085593fcfe6f789d417464826858c8402a14b58

Merge branch 'greasepencil-object' into temp-greasepencil-vfx

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



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

diff --cc source/blender/draw/engines/gpencil/gpencil_engine.c
index f1d5a291a3c,0cdbef47b59..c231decb42d
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@@ -449,11 -379,11 +449,11 @@@ void GPENCIL_cache_init(void *vedata
  		 * This pass is used too to take the snapshot used for background_pass. This image
  		 * will be used as the background while the user is drawing.
  		 */
- 		psl->mix_pass_noblend = DRW_pass_create("GPencil Mix Pass no blend", DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_ALWAYS);
+ 		psl->mix_pass_noblend = DRW_pass_create("GPencil Mix Pass no blend", DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS);
  		DRWShadingGroup *mix_shgrp_noblend = DRW_shgroup_create(e_data.gpencil_fullscreen_sh, psl->mix_pass_noblend);
  		DRW_shgroup_call_add(mix_shgrp_noblend, quad, NULL);
 -		DRW_shgroup_uniform_texture_ref(mix_shgrp_noblend, "strokeColor", &e_data.temp_color_tx_a);
 -		DRW_shgroup_uniform_texture_ref(mix_shgrp_noblend, "strokeDepth", &e_data.temp_depth_tx_a);
 +		DRW_shgroup_uniform_texture_ref(mix_shgrp_noblend, "strokeColor", &e_data.input_color_tx);
 +		DRW_shgroup_uniform_texture_ref(mix_shgrp_noblend, "strokeDepth", &e_data.input_depth_tx);
  		DRW_shgroup_uniform_int(mix_shgrp_noblend, "tonemapping", &stl->storage->tonemapping, 1);
  
  		/* Painting session pass (used only to speedup while the user is drawing )