griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Sculpt Branch:

Browse Source 
* Fix some svn merge errors.
This commit is contained in:
Brecht Van Lommel
2009-12-03 18:28:04 +00:00
parent 2582e3a900
commit e10ae8a1a2
3 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/ui/space_sequencer.py
View 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()

3
release/scripts/ui/space_view3d.py
View 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()

1
release/scripts/ui/space_view3d_toolbar.py
View 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:")