Sculpt Branch:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Thu, 3 Dec 2009 18:28:04 +0000 (18:28 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Thu, 3 Dec 2009 18:28:04 +0000 (18:28 +0000)
* Fix some svn merge errors.

release/scripts/ui/space_sequencer.py
release/scripts/ui/space_view3d.py
release/scripts/ui/space_view3d_toolbar.py

index 86c6b9766d436d9dd3a6c3380b48dfa2cb797c46..8ac77a50d558086c04874badd160bbf396d748f6 100644 (file)
@@ -238,7 +238,6 @@ class SEQUENCER_MT_strip(bpy.types.Menu):
                 layout.separator()
                 layout.operator("sequencer.image_change")
                 layout.operator("sequencer.rendersize")
-                layout.itemO("sequencer.rendersize")
             elif stype == 'SCENE':
                 layout.separator()
                 layout.operator("sequencer.scene_change", text="Change Scene")
@@ -246,7 +245,6 @@ class SEQUENCER_MT_strip(bpy.types.Menu):
                 layout.separator()
                 layout.operator("sequencer.movie_change")
                 layout.operator("sequencer.rendersize")
-                layout.itemO("sequencer.rendersize")
 
         layout.separator()
 
index f9401c021dd57af4b5a74373e1844c1d51c18922..5f3a86e81b35fcb5e22fd0814a6343b9652d7144 100644 (file)
@@ -376,7 +376,6 @@ class VIEW3D_MT_select_particle(bpy.types.Menu):
         layout.operator("particle.select_all_toggle", text="Select/Deselect All")
         layout.operator("particle.select_linked")
         layout.operator("particle.select_inverse")
-        layout.itemO("particle.select_inverse")
 
         layout.separator()
 
@@ -410,8 +409,6 @@ class VIEW3D_MT_select_edit_mesh(bpy.types.Menu):
         layout.operator("mesh.faces_select_linked_flat", text="Linked Flat Faces")
         layout.operator("mesh.faces_select_interior", text="Interior Faces")
         layout.operator("mesh.select_axis", text="Side of Active")
-        layout.itemO("mesh.faces_select_interior", text="Interior Faces")
-        layout.itemO("mesh.select_axis", text="Side of Active")
 
         layout.separator()
 
index 4e2e2f18b2ea117719d5c9020037ca17007bfd36..8d0c644cb11d63958a267cd804a33697c13d804c 100644 (file)
@@ -105,7 +105,6 @@ class VIEW3D_PT_tools_meshedit(View3DPanel):
         col.operator("mesh.duplicate_move")
         col.operator("mesh.spin")
         col.operator("mesh.screw")
-        col.itemO("mesh.flip_normals")
 
         col = layout.column(align=True)
         col.label(text="Remove:")