[Bf-blender-cvs] [40207d656be] master: Eevee: Render alpha blended objects when rendering probes

[Clément Foucault]

Commit: 40207d656becdbde231b86ed66c83c74c4baabe8
Author: Clément Foucault
Date:   Tue May 28 19:38:41 2019 +0200
Branches: master
https://developer.blender.org/rB40207d656becdbde231b86ed66c83c74c4baabe8

Eevee: Render alpha blended objects when rendering probes

This fix T64553 EEVEE: Emission material not lighting
other objects when blend mode set to alpha blend

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

M	source/blender/draw/engines/eevee/eevee_lightcache.c
M	source/blender/draw/engines/eevee/eevee_lightprobes.c

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

diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.c b/source/blender/draw/engines/eevee/eevee_lightcache.c
index 536ecb1bc42..935c8a8fadc 100644
--- a/source/blender/draw/engines/eevee/eevee_lightcache.c
+++ b/source/blender/draw/engines/eevee/eevee_lightcache.c
@@ -767,6 +767,9 @@ static void eevee_lightbake_cache_create(EEVEE_Data *vedata, EEVEE_LightBake *lb
   EEVEE_lights_cache_finish(sldata, vedata);
   EEVEE_lightprobes_cache_finish(sldata, vedata);
 
+  /* Disable volumetrics when baking. */
+  stl->effects->enabled_effects &= ~EFFECT_VOLUMETRIC;
+
   EEVEE_effects_draw_init(sldata, vedata);
   EEVEE_volumes_draw_init(sldata, vedata);
 
diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c
index 78565f9c465..6253a9d3808 100644
--- a/source/blender/draw/engines/eevee/eevee_lightprobes.c
+++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c
@@ -911,6 +911,7 @@ static void lightbake_render_scene_face(int face, EEVEE_BakeRenderData *user_dat
   DRW_draw_pass(psl->sss_pass); /* Only output standard pass */
   DRW_draw_pass(psl->sss_pass_cull);
   EEVEE_draw_default_passes(psl);
+  DRW_draw_pass(psl->transparent_pass);
 }
 
 /* Render the scene to the probe_rt texture. */