archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'blender-v2.93-release'

Browse Source
This commit is contained in:
Clément Foucault
2021-04-20 17:45:36 +02:00
parent f1b61f5e7d 3735986e87
commit f2626f1420
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/draw/engines/eevee/eevee_effects.c
View File

@@ -171,7 +171,8 @@ void EEVEE_effects_init(EEVEE_ViewLayerData *sldata,
}); });
} }
else { else {
txl->filtered_radiance = NULL; DRW_TEXTURE_FREE_SAFE(txl->filtered_radiance);
GPU_FRAMEBUFFER_FREE_SAFE(fbl->radiance_filtered_fb);
} }
/** /**

10
source/blender/draw/engines/eevee/eevee_materials.c
View File

@@ -1081,12 +1081,22 @@ void EEVEE_material_output_accumulate(EEVEE_ViewLayerData *sldata, EEVEE_Data *v
} }
} }
if (pd->render_passes & EEVEE_RENDER_PASS_SPECULAR_COLOR) { if (pd->render_passes & EEVEE_RENDER_PASS_SPECULAR_COLOR) {
bool prev_ssr = sldata->common_data.ssr_toggle;
if (prev_ssr) {
/* We need to disable ssr here so output radiance is not directed to the ssr buffer. */
sldata->common_data.ssr_toggle = false;
GPU_uniformbuf_update(sldata->common_ubo, &sldata->common_data);
}
material_renderpass_accumulate(fbl, material_renderpass_accumulate(fbl,
material_accum_ps, material_accum_ps,
NULL, NULL,
pd, pd,
txl->spec_color_accum, txl->spec_color_accum,
sldata->renderpass_ubo.spec_color); sldata->renderpass_ubo.spec_color);
if (prev_ssr) {
sldata->common_data.ssr_toggle = prev_ssr;
GPU_uniformbuf_update(sldata->common_ubo, &sldata->common_data);
}
} }
if (pd->render_passes & EEVEE_RENDER_PASS_SPECULAR_LIGHT) { if (pd->render_passes & EEVEE_RENDER_PASS_SPECULAR_LIGHT) {
material_renderpass_accumulate(fbl, material_renderpass_accumulate(fbl,