merge from trunk 38379

2011-07-14 17:29:53 +00:00
parent 470a5017fb 4da4943b5c
commit fa46278e34
352 changed files with 34266 additions and 32729 deletions
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@ -136,9 +136,10 @@ class NODE_MT_node(bpy.types.Menu):
        layout.operator("transform.resize")

        layout.separator()
-
+        
        layout.operator("node.duplicate_move")
        layout.operator("node.delete")
+        layout.operator("node.delete_reconnect")

        layout.separator()
        layout.operator("node.link_make")