Cycles:
authorThomas Dinges <blender@dingto.org>
Thu, 29 Sep 2011 20:28:46 +0000 (20:28 +0000)
committerThomas Dinges <blender@dingto.org>
Thu, 29 Sep 2011 20:28:46 +0000 (20:28 +0000)
* Remove duplicate declarations.

release/scripts/startup/bl_ui/space_node.py

index afd72b87384c5850c26559ad6e9fa18d119d688a..2cbb75f615bbca8e66fec220746431f2c6500c91 100644 (file)
@@ -47,10 +47,8 @@ class NODE_HT_header(Header):
             row.prop(snode, "shader_type", text="", expand=True)
 
             if snode.shader_type == 'OBJECT':
             row.prop(snode, "shader_type", text="", expand=True)
 
             if snode.shader_type == 'OBJECT':
-                ob = snode.id_from
-                snode_id = snode.id
-                if ob:
-                    layout.template_ID(ob, "active_material", new="material.new")
+                if id_from:
+                    layout.template_ID(id_from, "active_material", new="material.new")
                 if snode_id:
                     layout.prop(snode_id, "use_nodes")
 
                 if snode_id:
                     layout.prop(snode_id, "use_nodes")