svn merge ^/trunk/blender -r43676:43685

2012-01-24 22:44:48 +00:00
parent 3f31145d29 1aadbdedc7
commit 75a4832af3
7 changed files with 16 additions and 5 deletions
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@ -61,6 +61,8 @@ class NODE_HT_header(Header):
                    
            if snode.shader_type == 'WORLD':
                layout.template_ID(scene, "world", new="world.new")
+                if snode_id:
+                    layout.prop(snode_id, "use_nodes")

        elif snode.tree_type == 'TEXTURE':
            layout.prop(snode, "texture_type", text="", expand=True)