diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-01-07 02:55:15 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-01-07 02:55:15 +0400 |
| commit | 549c75fc6163c9953c856cbe8761c59d33b4298d (patch) | |
| tree | e6f4e73557ffdde5b14d4d10281a814f589bc67c /release | |
| parent | d919c30ac3e9b298596200fc7d7289a09cb4fc7f (diff) | |
Fix for last commit, missed check for ob, could cause errors when object was removed.
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_node.py | 2 |
1 files changed, 1 insertions, 1 deletions
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") |