[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25099] branches/sculpt25/release/scripts/ ui: Sculpt Branch:

Brecht Van Lommel brecht at blender.org
Thu Dec 3 19:28:04 CET 2009


Revision: 25099
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25099
Author:   blendix
Date:     2009-12-03 19:28:04 +0100 (Thu, 03 Dec 2009)

Log Message:
-----------
Sculpt Branch:
* Fix some svn merge errors.

Modified Paths:
--------------
    branches/sculpt25/release/scripts/ui/space_sequencer.py
    branches/sculpt25/release/scripts/ui/space_view3d.py
    branches/sculpt25/release/scripts/ui/space_view3d_toolbar.py

Modified: branches/sculpt25/release/scripts/ui/space_sequencer.py
===================================================================
--- branches/sculpt25/release/scripts/ui/space_sequencer.py	2009-12-03 17:17:24 UTC (rev 25098)
+++ branches/sculpt25/release/scripts/ui/space_sequencer.py	2009-12-03 18:28:04 UTC (rev 25099)
@@ -238,7 +238,6 @@
                 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 @@
                 layout.separator()
                 layout.operator("sequencer.movie_change")
                 layout.operator("sequencer.rendersize")
-                layout.itemO("sequencer.rendersize")
 
         layout.separator()
 

Modified: branches/sculpt25/release/scripts/ui/space_view3d.py
===================================================================
--- branches/sculpt25/release/scripts/ui/space_view3d.py	2009-12-03 17:17:24 UTC (rev 25098)
+++ branches/sculpt25/release/scripts/ui/space_view3d.py	2009-12-03 18:28:04 UTC (rev 25099)
@@ -376,7 +376,6 @@
         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 @@
         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()
 

Modified: branches/sculpt25/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- branches/sculpt25/release/scripts/ui/space_view3d_toolbar.py	2009-12-03 17:17:24 UTC (rev 25098)
+++ branches/sculpt25/release/scripts/ui/space_view3d_toolbar.py	2009-12-03 18:28:04 UTC (rev 25099)
@@ -105,7 +105,6 @@
         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:")





More information about the Bf-blender-cvs mailing list