Commit: 7d2745f8b3bf2db6edcf6af388ef4958ebd2f1b8 Author: Jeroen Bakker Date: Mon Dec 7 09:31:05 2020 +0100 Branches: master https://developer.blender.org/rB7d2745f8b3bf2db6edcf6af388ef4958ebd2f1b8
Fix Cryptomatte panel not visible in EEVEE Caused by {rB5baae026a86f} =================================================================== M intern/cycles/blender/addon/ui.py M release/scripts/startup/bl_ui/properties_view_layer.py =================================================================== diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index aecdb3e7572..623e5cf9e37 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -23,7 +23,7 @@ from bl_ui.utils import PresetPanel from bpy.types import Panel from bl_ui.properties_grease_pencil_common import GreasePencilSimplifyPanel -from bl_ui.properties_view_layer import VIEWLAYER_PT_layer_passes_cryptomatte +from bl_ui.properties_view_layer import ViewLayerCryptomattePanel class CYCLES_PT_sampling_presets(PresetPanel, Panel): @@ -886,7 +886,7 @@ class CYCLES_RENDER_PT_passes_light(CyclesButtonsPanel, Panel): col.prop(view_layer, "use_pass_ambient_occlusion", text="Ambient Occlusion") -class CYCLES_RENDER_PT_passes_crypto(CyclesButtonsPanel, VIEWLAYER_PT_layer_passes_cryptomatte): +class CYCLES_RENDER_PT_passes_crypto(CyclesButtonsPanel, ViewLayerCryptomattePanel): bl_label = "Cryptomatte" bl_context = "view_layer" bl_parent_id = "CYCLES_RENDER_PT_passes" diff --git a/release/scripts/startup/bl_ui/properties_view_layer.py b/release/scripts/startup/bl_ui/properties_view_layer.py index b7aacd0c8be..27df3b10853 100644 --- a/release/scripts/startup/bl_ui/properties_view_layer.py +++ b/release/scripts/startup/bl_ui/properties_view_layer.py @@ -171,10 +171,8 @@ class VIEWLAYER_PT_layer_passes_aov(ViewLayerButtonsPanel, Panel): layout.label(text="Conflicts with another render pass with the same name", icon='ERROR') -class VIEWLAYER_PT_layer_passes_cryptomatte(ViewLayerButtonsPanel, Panel): +class ViewLayerCryptomattePanel(ViewLayerButtonsPanel, Panel): bl_label = "Cryptomatte" - bl_parent_id = "VIEWLAYER_PT_layer_passes" - COMPAT_ENGINES = {'BLENDER_EEVEE'} def draw(self, context): layout = self.layout @@ -196,6 +194,11 @@ class VIEWLAYER_PT_layer_passes_cryptomatte(ViewLayerButtonsPanel, Panel): col.prop(view_layer, "use_pass_cryptomatte_accurate", text="Accurate Mode") +class VIEWLAYER_PT_layer_passes_cryptomatte(ViewLayerCryptomattePanel): + bl_parent_id = "VIEWLAYER_PT_layer_passes" + COMPAT_ENGINES = {'BLENDER_EEVEE'} + + classes = ( VIEWLAYER_PT_layer, VIEWLAYER_PT_layer_passes, _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs