Merge branch 'blender-v2.93-release'
This commit is contained in:
commit
f2626f1420
|
@ -171,7 +171,8 @@ void EEVEE_effects_init(EEVEE_ViewLayerData *sldata,
|
|||
});
|
||||
}
|
||||
else {
|
||||
txl->filtered_radiance = NULL;
|
||||
DRW_TEXTURE_FREE_SAFE(txl->filtered_radiance);
|
||||
GPU_FRAMEBUFFER_FREE_SAFE(fbl->radiance_filtered_fb);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -1081,12 +1081,22 @@ void EEVEE_material_output_accumulate(EEVEE_ViewLayerData *sldata, EEVEE_Data *v
|
|||
}
|
||||
}
|
||||
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_accum_ps,
|
||||
NULL,
|
||||
pd,
|
||||
txl->spec_color_accum,
|
||||
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) {
|
||||
material_renderpass_accumulate(fbl,
|
||||
|
|
Loading…
Reference in New Issue