From cac0e604e7b8176fd79b45ededc5fda990201832 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 13 May 2019 22:32:50 +0200 Subject: Fix T64297: edit light energy not working for Eevee, when nodes exist Simplify code now that Cycles also has energy outside nodes. --- release/scripts/startup/bl_ui/space_view3d.py | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) (limited to 'release') diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 23cd2c36e76..1b4c9c9f5fe 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -2292,29 +2292,10 @@ class VIEW3D_MT_object_context_menu(Menu): layout.operator_context = 'INVOKE_REGION_WIN' - emission_node = None - if light.node_tree: - for node in light.node_tree.nodes: - if getattr(node, "type", None) == 'EMISSION': - emission_node = node - break - - if is_eevee and not emission_node: - props = layout.operator("wm.context_modal_mouse", text="Energy") - props.data_path_iter = "selected_editable_objects" - props.data_path_item = "data.energy" - props.header_text = "Light Energy: %.3f" - - if emission_node is not None: - props = layout.operator("wm.context_modal_mouse", text="Energy") - props.data_path_iter = "selected_editable_objects" - props.data_path_item = ( - "data.node_tree" - ".nodes[\"" + emission_node.name + "\"]" - ".inputs[\"Strength\"].default_value" - ) - props.header_text = "Light Energy: %.3f" - props.input_scale = 0.1 + props = layout.operator("wm.context_modal_mouse", text="Energy") + props.data_path_iter = "selected_editable_objects" + props.data_path_item = "data.energy" + props.header_text = "Light Energy: %.3f" if light.type == 'AREA': props = layout.operator("wm.context_modal_mouse", text="Size X") -- cgit v1.2.3