[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40700] branches/cycles/release/scripts/ startup/bl_ui/space_node.py: Cycles:

[Thomas Dinges]

Revision: 40700
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40700
Author:   dingto
Date:     2011-09-29 20:28:46 +0000 (Thu, 29 Sep 2011)
Log Message:
-----------
Cycles:
* Remove duplicate declarations. 

Modified Paths:
--------------
    branches/cycles/release/scripts/startup/bl_ui/space_node.py

Modified: branches/cycles/release/scripts/startup/bl_ui/space_node.py
===================================================================
--- branches/cycles/release/scripts/startup/bl_ui/space_node.py	2011-09-29 18:37:09 UTC (rev 40699)
+++ branches/cycles/release/scripts/startup/bl_ui/space_node.py	2011-09-29 20:28:46 UTC (rev 40700)
@@ -47,10 +47,8 @@
             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")