diff options
| author | Jeroen Bakker <jbakker> | 2020-07-02 12:19:12 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2020-07-02 12:27:23 +0300 |
| commit | ba2c039b05a84de1dccbeef71b8b2ac89a072869 (patch) | |
| tree | ea652b6ebdc9d04d757042fed984bac9b7085bdc /source/blender/draw/engines/eevee/eevee_materials.c | |
| parent | 945d0269e32efa1e5fd4091ae0f6366031f5ed04 (diff) | |
Fix T77686: EEVEE environment pass with film transparency
When the film is set to transparent the environment pass should still be
rendered solid. otherwise it renders black.
Reviewed By: Clément Foucault
Differential Revision: https://developer.blender.org/D8046
Diffstat (limited to 'source/blender/draw/engines/eevee/eevee_materials.c')
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_materials.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index 8537ad0e532..8c17ecd3905 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -325,27 +325,31 @@ void EEVEE_materials_init(EEVEE_ViewLayerData *sldata, if (sldata->renderpass_ubo.combined == NULL) { sldata->renderpass_ubo.combined = DRW_uniformbuffer_create( sizeof(EEVEE_RenderPassData), - &(const EEVEE_RenderPassData){true, true, true, true, true, false}); + &(const EEVEE_RenderPassData){true, true, true, true, true, false, false}); sldata->renderpass_ubo.diff_color = DRW_uniformbuffer_create( sizeof(EEVEE_RenderPassData), - &(const EEVEE_RenderPassData){true, false, false, false, false, true}); + &(const EEVEE_RenderPassData){true, false, false, false, false, true, false}); sldata->renderpass_ubo.diff_light = DRW_uniformbuffer_create( sizeof(EEVEE_RenderPassData), - &(const EEVEE_RenderPassData){true, true, false, false, false, false}); + &(const EEVEE_RenderPassData){true, true, false, false, false, false, false}); sldata->renderpass_ubo.spec_color = DRW_uniformbuffer_create( sizeof(EEVEE_RenderPassData), - &(const EEVEE_RenderPassData){false, false, true, false, false, false}); + &(const EEVEE_RenderPassData){false, false, true, false, false, false, false}); sldata->renderpass_ubo.spec_light = DRW_uniformbuffer_create( sizeof(EEVEE_RenderPassData), - &(const EEVEE_RenderPassData){false, false, true, true, false, false}); + &(const EEVEE_RenderPassData){false, false, true, true, false, false, false}); sldata->renderpass_ubo.emit = DRW_uniformbuffer_create( sizeof(EEVEE_RenderPassData), - &(const EEVEE_RenderPassData){false, false, false, false, true, false}); + &(const EEVEE_RenderPassData){false, false, false, false, true, false, false}); + + sldata->renderpass_ubo.environment = DRW_uniformbuffer_create( + sizeof(EEVEE_RenderPassData), + &(const EEVEE_RenderPassData){true, true, true, true, true, false, true}); } /* Used combined pass by default. */ @@ -408,7 +412,7 @@ void EEVEE_materials_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) DRW_shgroup_uniform_block(grp, "planar_block", sldata->planar_ubo); DRW_shgroup_uniform_block(grp, "light_block", sldata->light_ubo); DRW_shgroup_uniform_block(grp, "shadow_block", sldata->shadow_ubo); - DRW_shgroup_uniform_block(grp, "renderpass_block", sldata->renderpass_ubo.combined); + DRW_shgroup_uniform_block_ref(grp, "renderpass_block", &stl->g_data->renderpass_ubo); DRW_shgroup_call(grp, geom, NULL); } @@ -1073,7 +1077,7 @@ void EEVEE_material_output_accumulate(EEVEE_ViewLayerData *sldata, EEVEE_Data *v DRWPass *material_accum_ps = psl->material_accum_ps; if (pd->render_passes & EEVEE_RENDER_PASS_ENVIRONMENT) { material_renderpass_accumulate( - fbl, psl->background_accum_ps, pd, txl->env_accum, sldata->renderpass_ubo.combined); + fbl, psl->background_accum_ps, pd, txl->env_accum, sldata->renderpass_ubo.environment); } if (pd->render_passes & EEVEE_RENDER_PASS_EMIT) { material_renderpass_accumulate( |