From f81dcbb67e826844bae130f46f65d617c2ae0c12 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 30 Oct 2024 13:20:00 +1100 Subject: [PATCH] Cleanup: remove BLENDER_EEVEE checks Since the engine has been removed there is no need to check for it. --- scripts/startup/bl_ui/node_add_menu_shader.py | 2 +- scripts/startup/bl_ui/properties_data_camera.py | 2 +- scripts/startup/bl_ui/properties_view_layer.py | 3 --- scripts/startup/bl_ui/space_node.py | 3 +-- scripts/startup/bl_ui/space_view3d.py | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/scripts/startup/bl_ui/node_add_menu_shader.py b/scripts/startup/bl_ui/node_add_menu_shader.py index 4fdc2c1a3bd..d065df2859b 100644 --- a/scripts/startup/bl_ui/node_add_menu_shader.py +++ b/scripts/startup/bl_ui/node_add_menu_shader.py @@ -36,7 +36,7 @@ def cycles_shader_nodes_poll(context): def eevee_shader_nodes_poll(context): - return context.engine in {'BLENDER_EEVEE', 'BLENDER_EEVEE_NEXT'} + return context.engine == 'BLENDER_EEVEE_NEXT' def object_cycles_shader_nodes_poll(context): diff --git a/scripts/startup/bl_ui/properties_data_camera.py b/scripts/startup/bl_ui/properties_data_camera.py index 6a75226758b..2c68f7a06ff 100644 --- a/scripts/startup/bl_ui/properties_data_camera.py +++ b/scripts/startup/bl_ui/properties_data_camera.py @@ -134,7 +134,7 @@ class DATA_PT_lens(CameraButtonsPanel, Panel): sub = col.column(align=True) sub.prop(cam, "central_cylindrical_radius", text="Cylinder radius") - elif engine in {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_EEVEE_NEXT', 'BLENDER_WORKBENCH'}: + elif engine in {'BLENDER_RENDER', 'BLENDER_EEVEE_NEXT', 'BLENDER_WORKBENCH'}: if cam.lens_unit == 'MILLIMETERS': col.prop(cam, "lens") elif cam.lens_unit == 'FOV': diff --git a/scripts/startup/bl_ui/properties_view_layer.py b/scripts/startup/bl_ui/properties_view_layer.py index fd681e5bca3..8d4a1c0f1b6 100644 --- a/scripts/startup/bl_ui/properties_view_layer.py +++ b/scripts/startup/bl_ui/properties_view_layer.py @@ -193,9 +193,6 @@ class ViewLayerCryptomattePanelHelper(ViewLayerButtonsPanel): )) col.prop(view_layer, "pass_cryptomatte_depth", text="Levels") - if context.engine == 'BLENDER_EEVEE': - col.prop(view_layer, "use_pass_cryptomatte_accurate", text="Accurate Mode") - class VIEWLAYER_PT_layer_passes_cryptomatte(ViewLayerCryptomattePanelHelper, Panel): bl_parent_id = "VIEWLAYER_PT_layer_passes" diff --git a/scripts/startup/bl_ui/space_node.py b/scripts/startup/bl_ui/space_node.py index a41fb152803..df23c08cc2e 100644 --- a/scripts/startup/bl_ui/space_node.py +++ b/scripts/startup/bl_ui/space_node.py @@ -63,8 +63,7 @@ class NODE_HT_header(Header): NODE_MT_editor_menus.draw_collapsible(context, layout) - # No shader nodes for EEVEE lights. - if snode_id and not (context.engine == 'BLENDER_EEVEE' and ob_type == 'LIGHT'): + if snode_id: row = layout.row() row.prop(snode_id, "use_nodes") diff --git a/scripts/startup/bl_ui/space_view3d.py b/scripts/startup/bl_ui/space_view3d.py index 2e8a2a45a7e..ea69ab67d25 100644 --- a/scripts/startup/bl_ui/space_view3d.py +++ b/scripts/startup/bl_ui/space_view3d.py @@ -6430,7 +6430,7 @@ class VIEW3D_PT_shading_lighting(Panel): return True if shading.type == 'RENDERED': engine = context.scene.render.engine - if engine in {'BLENDER_EEVEE', 'BLENDER_EEVEE_NEXT'}: + if engine == 'BLENDER_EEVEE_NEXT': return True return False