Fix: EEVEE-Next: Missing mandatory combined pass

Cycles and EEVEE-Next disregard `use_pass_combined` option.
Avoid changing the behavior.

Fix #122188
This commit is contained in:
Clément Foucault
2024-06-14 16:26:13 +02:00
parent 5b30ded989
commit e23e5443e7

View File

@@ -171,12 +171,14 @@ static eViewLayerEEVEEPassType enabled_passes(const ViewLayer *view_layer)
{
eViewLayerEEVEEPassType result = eViewLayerEEVEEPassType(view_layer->eevee.render_passes);
/* We enforce the use of combined pass to be compliant with Cycles and EEVEE-Legacy (#122188). */
result |= EEVEE_RENDER_PASS_COMBINED;
#define ENABLE_FROM_LEGACY(name_legacy, name_eevee) \
SET_FLAG_FROM_TEST(result, \
(view_layer->passflag & SCE_PASS_##name_legacy) != 0, \
EEVEE_RENDER_PASS_##name_eevee);
ENABLE_FROM_LEGACY(COMBINED, COMBINED)
ENABLE_FROM_LEGACY(Z, Z)
ENABLE_FROM_LEGACY(MIST, MIST)
ENABLE_FROM_LEGACY(NORMAL, NORMAL)