[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24110] trunk/blender/release/scripts/ui/ space_view3d_toolbar.py: Accidentally overrode changes by Aligorith in previous commit.

[William Reynish]

Revision: 24110
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24110
Author:   billrey
Date:     2009-10-27 14:08:50 +0100 (Tue, 27 Oct 2009)

Log Message:
-----------
Accidentally overrode changes by Aligorith in previous commit. Fixed.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_view3d_toolbar.py

Modified: trunk/blender/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d_toolbar.py	2009-10-27 12:46:20 UTC (rev 24109)
+++ trunk/blender/release/scripts/ui/space_view3d_toolbar.py	2009-10-27 13:08:50 UTC (rev 24110)
@@ -22,7 +22,7 @@
 		
 		col = layout.column(align=True)
 		col.itemL(text="Object:")
-		col.itemO("object.duplicate")
+		col.itemO("object.duplicate_move")
 		col.itemO("object.delete")
 		
 		active_object= context.active_object
@@ -67,12 +67,12 @@
 		
 		col = layout.column(align=True)
 		col.itemL(text="Mesh:")
-		col.itemO("mesh.duplicate")
+		col.itemO("mesh.duplicate_move")
 		col.itemO("mesh.delete")
 		
 		col = layout.column(align=True)
 		col.itemL(text="Modeling:")
-		col.itemO("mesh.extrude")
+		col.itemO("mesh.extrude_move")
 		col.itemO("mesh.subdivide")
 		col.itemO("mesh.loopcut")
 		col.itemO("mesh.spin")
@@ -245,12 +245,12 @@
 		col = layout.column(align=True)
 		col.itemL(text="Bones:")
 		col.itemO("armature.bone_primitive_add", text="Add")
-		col.itemO("armature.duplicate", text="Duplicate")
+		col.itemO("armature.duplicate_move", text="Duplicate")
 		col.itemO("armature.delete", text="Delete")
 		
 		col = layout.column(align=True)
 		col.itemL(text="Modeling:")
-		col.itemO("armature.extrude")
+		col.itemO("armature.extrude_move")
 		
 		col = layout.column(align=True)
 		col.itemL(text="Grease Pencil:")
@@ -264,9 +264,21 @@
 		col.itemO("screen.repeat_history", text="History...")
 		col.itemO("screen.redo_last", text="Tweak...")
 		
+class VIEW3D_PT_tools_armatureedit_options(View3DPanel):
+	__context__ = "armature_edit"
+	__label__ = "Armature Options"
 
+	def draw(self, context):
+		layout = self.layout
+		
+		arm = context.active_object.data
 
+		col = layout.column(align=True)
+		col.itemR(arm, "x_axis_mirror")
+		
 
+
+
 # ********** default tools for editmode_mball ****************
 
 class VIEW3D_PT_tools_mballedit(View3DPanel):
@@ -383,19 +395,7 @@
 		col = layout.column(align=True)
 		col.itemR(arm, "x_axis_mirror")
 		col.itemR(arm, "auto_ik")
-		
-class VIEW3D_PT_tools_armatureedit_options(View3DPanel):
-	__context__ = "armature_edit"
-	__label__ = "Armature Options"
 
-	def draw(self, context):
-		layout = self.layout
-		
-		arm = context.active_object.data
-
-		col = layout.column(align=True)
-		col.itemR(arm, "x_axis_mirror")
-
 # ********** default tools for paint modes ****************
 
 class PaintPanel(bpy.types.Panel):