From 8f12457c256acebb17942260c2807789357daef7 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 29 Jul 2021 16:39:19 +0200 Subject: Fix T90295: inconsistent render pass order between Cycles and Eevee --- intern/cycles/blender/addon/engine.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'intern') diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py index 29f8cd8f8cd..489a883f098 100644 --- a/intern/cycles/blender/addon/engine.py +++ b/intern/cycles/blender/addon/engine.py @@ -235,9 +235,12 @@ def system_info(): def list_render_passes(scene, srl): - # Builtin Blender passes. + crl = srl.cycles + + # Combined pass. yield ("Combined", "RGBA", 'COLOR') + # Data passes. if srl.use_pass_z: yield ("Depth", "Z", 'VALUE') if srl.use_pass_mist: yield ("Mist", "Z", 'VALUE') if srl.use_pass_normal: yield ("Normal", "XYZ", 'VECTOR') @@ -245,8 +248,8 @@ def list_render_passes(scene, srl): if srl.use_pass_uv: yield ("UV", "UVA", 'VECTOR') if srl.use_pass_object_index: yield ("IndexOB", "X", 'VALUE') if srl.use_pass_material_index: yield ("IndexMA", "X", 'VALUE') - if srl.use_pass_shadow: yield ("Shadow", "RGB", 'COLOR') - if srl.use_pass_ambient_occlusion: yield ("AO", "RGB", 'COLOR') + + # Light passes. if srl.use_pass_diffuse_direct: yield ("DiffDir", "RGB", 'COLOR') if srl.use_pass_diffuse_indirect: yield ("DiffInd", "RGB", 'COLOR') if srl.use_pass_diffuse_color: yield ("DiffCol", "RGB", 'COLOR') @@ -256,15 +259,16 @@ def list_render_passes(scene, srl): if srl.use_pass_transmission_direct: yield ("TransDir", "RGB", 'COLOR') if srl.use_pass_transmission_indirect: yield ("TransInd", "RGB", 'COLOR') if srl.use_pass_transmission_color: yield ("TransCol", "RGB", 'COLOR') + if crl.use_pass_volume_direct: yield ("VolumeDir", "RGB", 'COLOR') + if crl.use_pass_volume_indirect: yield ("VolumeInd", "RGB", 'COLOR') if srl.use_pass_emit: yield ("Emit", "RGB", 'COLOR') if srl.use_pass_environment: yield ("Env", "RGB", 'COLOR') + if srl.use_pass_shadow: yield ("Shadow", "RGB", 'COLOR') + if srl.use_pass_ambient_occlusion: yield ("AO", "RGB", 'COLOR') - # Cycles specific passes. - crl = srl.cycles + # Debug passes. if crl.pass_debug_render_time: yield ("Debug Render Time", "X", 'VALUE') if crl.pass_debug_sample_count: yield ("Debug Sample Count", "X", 'VALUE') - if crl.use_pass_volume_direct: yield ("VolumeDir", "RGB", 'COLOR') - if crl.use_pass_volume_indirect: yield ("VolumeInd", "RGB", 'COLOR') # Cryptomatte passes. crypto_depth = (srl.pass_cryptomatte_depth + 1) // 2 -- cgit v1.2.3