diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2021-02-12 13:55:42 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2021-02-12 13:55:42 +0300 |
| commit | ed667e344d7e9f72f2b1a0302e241606276a06ae (patch) | |
| tree | cc2e575443861d285b99c58434ddd7282b237cad /release | |
| parent | 9a7dc41dd9b9803c30eb24bc74927a312b40ba4d (diff) | |
| parent | 26481eabe1e66da2a322190f15ad600d9d69bbee (diff) | |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_view_layer.py | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/release/scripts/startup/bl_ui/properties_view_layer.py b/release/scripts/startup/bl_ui/properties_view_layer.py index b3367063cc0..8c39684583f 100644 --- a/release/scripts/startup/bl_ui/properties_view_layer.py +++ b/release/scripts/startup/bl_ui/properties_view_layer.py @@ -119,7 +119,8 @@ class VIEWLAYER_PT_eevee_layer_passes_light(ViewLayerButtonsPanel, Panel): col.prop(view_layer, "use_pass_emit", text="Emission") col.prop(view_layer, "use_pass_environment") col.prop(view_layer, "use_pass_shadow") - col.prop(view_layer, "use_pass_ambient_occlusion", text="Ambient Occlusion") + col.prop(view_layer, "use_pass_ambient_occlusion", + text="Ambient Occlusion") class VIEWLAYER_PT_eevee_layer_passes_effects(ViewLayerButtonsPanel, Panel): @@ -143,10 +144,8 @@ class VIEWLAYER_PT_eevee_layer_passes_effects(ViewLayerButtonsPanel, Panel): col.active = scene_eevee.use_bloom -class VIEWLAYER_PT_layer_passes_aov(ViewLayerButtonsPanel, Panel): +class ViewLayerAOVPanel(ViewLayerButtonsPanel, Panel): bl_label = "Shader AOV" - bl_parent_id = "VIEWLAYER_PT_layer_passes" - COMPAT_ENGINES = {'BLENDER_EEVEE'} def draw(self, context): layout = self.layout @@ -158,7 +157,8 @@ class VIEWLAYER_PT_layer_passes_aov(ViewLayerButtonsPanel, Panel): row = layout.row() col = row.column() - col.template_list("VIEWLAYER_UL_aov", "aovs", view_layer, "aovs", view_layer, "active_aov_index", rows=2) + col.template_list("VIEWLAYER_UL_aov", "aovs", view_layer, + "aovs", view_layer, "active_aov_index", rows=2) col = row.column() sub = col.column(align=True) @@ -167,10 +167,16 @@ class VIEWLAYER_PT_layer_passes_aov(ViewLayerButtonsPanel, Panel): aov = view_layer.active_aov if aov and not aov.is_valid: - layout.label(text="Conflicts with another render pass with the same name", icon='ERROR') + layout.label( + text="Conflicts with another render pass with the same name", icon='ERROR') + + +class VIEWLAYER_PT_layer_passes_aov(ViewLayerAOVPanel): + bl_parent_id = "VIEWLAYER_PT_layer_passes" + COMPAT_ENGINES = {'BLENDER_EEVEE'} -class ViewLayerCryptomattePanel(ViewLayerButtonsPanel): +class ViewLayerCryptomattePanel(ViewLayerButtonsPanel, Panel): bl_label = "Cryptomatte" def draw(self, context): @@ -190,7 +196,8 @@ class ViewLayerCryptomattePanel(ViewLayerButtonsPanel): view_layer.use_pass_cryptomatte_material, view_layer.use_pass_cryptomatte_asset)) col.prop(view_layer, "pass_cryptomatte_depth", text="Levels") - col.prop(view_layer, "use_pass_cryptomatte_accurate", text="Accurate Mode") + col.prop(view_layer, "use_pass_cryptomatte_accurate", + text="Accurate Mode") class VIEWLAYER_PT_layer_passes_cryptomatte(ViewLayerCryptomattePanel, Panel): |