[Bf-blender-cvs] [001b97af410] temp-gpencil-drw-engine: Merge branch 'master' into temp-gpencil-drw-engine

[Antonioya]

Commit: 001b97af410c1d16c2c4382705cacfe4f43602c4
Author: Antonioya
Date:   Fri Jun 28 15:31:47 2019 +0200
Branches: temp-gpencil-drw-engine
https://developer.blender.org/rB001b97af410c1d16c2c4382705cacfe4f43602c4

Merge branch 'master' into temp-gpencil-drw-engine

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

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



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

diff --cc source/blender/draw/engines/gpencil/gpencil_engine.c
index e3e6f106988,e5dadba9bdc..e39e0c793ec
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@@ -539,18 -538,18 +539,18 @@@ void GPENCIL_cache_init(void *vedata
      }
  
      /* blend layers pass */
 -    psl->blend_pass = DRW_pass_create("GPencil Blend Layers Pass",
 -                                      DRW_STATE_WRITE_COLOR | DRW_STATE_BLEND_ALPHA |
 -                                          DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS);
 +    psl->blend_layers_pass = DRW_pass_create("GPencil Blend Layers Pass",
 +                                             DRW_STATE_WRITE_COLOR | DRW_STATE_BLEND_ALPHA |
 +                                                 DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS);
      DRWShadingGroup *blend_shgrp = DRW_shgroup_create(e_data.gpencil_blend_fullscreen_sh,
 -                                                      psl->blend_pass);
 +                                                      psl->blend_layers_pass);
      DRW_shgroup_call(blend_shgrp, quad, NULL);
 -    DRW_shgroup_uniform_texture_ref(blend_shgrp, "strokeColor", &stl->g_data->temp_color_tx_a);
 -    DRW_shgroup_uniform_texture_ref(blend_shgrp, "strokeDepth", &stl->g_data->temp_depth_tx_a);
 -    DRW_shgroup_uniform_texture_ref(blend_shgrp, "blendColor", &stl->g_data->temp_color_tx_fx);
 -    DRW_shgroup_uniform_texture_ref(blend_shgrp, "blendDepth", &stl->g_data->temp_depth_tx_fx);
 +    DRW_shgroup_uniform_texture_ref(blend_shgrp, "strokeColor", &stl->g_data->temp_color_a_tx);
 +    DRW_shgroup_uniform_texture_ref(blend_shgrp, "strokeDepth", &stl->g_data->temp_depth_a_tx);
 +    DRW_shgroup_uniform_texture_ref(blend_shgrp, "blendColor", &stl->g_data->temp_color_fx_tx);
 +    DRW_shgroup_uniform_texture_ref(blend_shgrp, "blendDepth", &stl->g_data->temp_depth_fx_tx);
      DRW_shgroup_uniform_int(blend_shgrp, "mode", &stl->storage->blend_mode, 1);
-     DRW_shgroup_uniform_int(blend_shgrp, "clamp_layer", &stl->storage->clamp_layer, 1);
+     DRW_shgroup_uniform_int(blend_shgrp, "mask_layer", &stl->storage->mask_layer, 1);
      DRW_shgroup_uniform_int(mix_shgrp, "tonemapping", &stl->storage->tonemapping, 1);
  
      /* create effects passes */