From 549c75fc6163c9953c856cbe8761c59d33b4298d Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Fri, 6 Jan 2012 22:55:15 +0000 Subject: Fix for last commit, missed check for ob, could cause errors when object was removed. --- release/scripts/startup/bl_ui/space_node.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'release') diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index 9f714f80b34..edbcf3ecf5b 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -48,7 +48,7 @@ class NODE_HT_header(Header): if scene.render.use_shading_nodes: layout.prop(snode, "shader_type", text="", expand=True) - if not scene.render.use_shading_nodes or snode.shader_type == 'OBJECT': + if (not scene.render.use_shading_nodes or snode.shader_type == 'OBJECT') and ob: # Show material.new when no active ID/slot exists if not id_from and ob.type in {'MESH', 'CURVE', 'SURFACE', 'FONT', 'METABALL'}: layout.template_ID(ob, "active_material", new="material.new") -- cgit v1.2.3