diff options
Diffstat (limited to 'release/scripts/startup/bl_ui/space_node.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_node.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index 8f7d8f7555a..2f98585f538 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -51,13 +51,14 @@ class NODE_HT_header(Header): NODE_MT_editor_menus.draw_collapsible(context, layout) layout.prop(snode, "tree_type", text="", expand=True) + use_shading_nodes = scene.view_render.use_shading_nodes or context.view_render.use_shading_nodes if snode.tree_type == 'ShaderNodeTree': - if scene.render.use_shading_nodes: + if use_shading_nodes: layout.prop(snode, "shader_type", text="", expand=True) ob = context.object - if (not scene.render.use_shading_nodes or snode.shader_type == 'OBJECT') and ob: + if (not use_shading_nodes or snode.shader_type == 'OBJECT') and ob: row = layout.row() # disable material slot buttons when pinned, cannot find correct slot within id_from (#36589) row.enabled = not snode.pin @@ -69,19 +70,19 @@ class NODE_HT_header(Header): row.template_ID(id_from, "active_material", new="material.new") # Don't show "Use Nodes" Button when Engine is BI for Lamps - if snode_id and not (scene.render.use_shading_nodes == 0 and ob.type == 'LAMP'): + if snode_id and not (use_shading_nodes == 0 and ob.type == 'LAMP'): layout.prop(snode_id, "use_nodes") - if scene.render.use_shading_nodes and snode.shader_type == 'WORLD': + if use_shading_nodes and snode.shader_type == 'WORLD': row = layout.row() row.enabled = not snode.pin row.template_ID(scene, "world", new="world.new") if snode_id: row.prop(snode_id, "use_nodes") - if scene.render.use_shading_nodes and snode.shader_type == 'LINESTYLE': - rl = context.scene.render.layers.active - lineset = rl.freestyle_settings.linesets.active + if use_shading_nodes and snode.shader_type == 'LINESTYLE': + view_layer = context.scene.view_layers.active + lineset = view_layer.freestyle_settings.linesets.active if lineset is not None: row = layout.row() row.enabled = not snode.pin @@ -271,7 +272,7 @@ class NODE_MT_node(Menu): layout.separator() - layout.operator("node.read_renderlayers") + layout.operator("node.read_viewlayers") layout.operator("node.read_fullsamplelayers") @@ -395,8 +396,7 @@ class NODE_PT_backdrop(Panel): col = layout.column(align=True) col.label(text="Offset:") - col.prop(snode, "backdrop_x", text="X") - col.prop(snode, "backdrop_y", text="Y") + col.prop(snode, "backdrop_offset", text="") col.operator("node.backimage_move", text="Move") layout.operator("node.backimage_fit", text="Fit") |