Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py77
1 files changed, 46 insertions, 31 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index a0051688a8e..d726a6599d2 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -967,6 +967,10 @@ class VIEW3D_MT_select_edit_text(Menu):
def draw(self, context):
layout = self.layout
+ layout.menu("VIEW3D_MT_undo_redo")
+
+ layout.separator()
+
layout.operator("font.text_paste", text="Paste")
layout.operator("font.text_cut", text="Cut")
layout.operator("font.text_copy", text="Copy")
@@ -1342,7 +1346,19 @@ class INFO_MT_add(Menu):
)
-# ********** Object menu **********
+class VIEW3D_MT_undo_redo(Menu):
+ bl_label = "Undo/Redo"
+ _operator_name = ""
+
+ def draw(self, context):
+ layout = self.layout
+
+ layout.operator("ed.undo")
+ layout.operator("ed.redo")
+
+ layout.separator()
+
+ layout.operator("ed.undo_history")
class VIEW3D_MT_object(Menu):
@@ -1354,9 +1370,7 @@ class VIEW3D_MT_object(Menu):
view = context.space_data
is_local_view = (view.local_view is not None)
- layout.operator("ed.undo")
- layout.operator("ed.redo")
- layout.operator("ed.undo_history")
+ layout.menu("VIEW3D_MT_undo_redo")
layout.separator()
@@ -1887,8 +1901,7 @@ class VIEW3D_MT_paint_vertex(Menu):
def draw(self, context):
layout = self.layout
- layout.operator("ed.redo")
- layout.operator("ed.undo")
+ layout.menu("VIEW3D_MT_undo_redo")
layout.separator()
@@ -1965,9 +1978,7 @@ class VIEW3D_MT_paint_weight(Menu):
def draw(self, context):
layout = self.layout
- layout.operator("ed.undo")
- layout.operator("ed.redo")
- layout.operator("ed.undo_history")
+ layout.menu("VIEW3D_MT_undo_redo")
layout.separator()
@@ -2015,8 +2026,7 @@ class VIEW3D_MT_sculpt(Menu):
toolsettings = context.tool_settings
sculpt = toolsettings.sculpt
- layout.operator("ed.redo")
- layout.operator("ed.undo")
+ layout.menu("VIEW3D_MT_undo_redo")
layout.separator()
@@ -2089,18 +2099,19 @@ class VIEW3D_MT_particle(Menu):
particle_edit = context.tool_settings.particle_edit
- layout.operator("ed.undo")
- layout.operator("ed.redo")
- layout.operator("ed.undo_history")
+ layout.menu("VIEW3D_MT_undo_redo")
layout.separator()
- layout.operator("particle.mirror")
+ layout.operator("particle.delete")
layout.separator()
+ layout.operator("particle.mirror")
+
layout.operator("particle.remove_doubles")
- layout.operator("particle.delete")
+
+ layout.separator()
if particle_edit.select_mode == 'POINT':
layout.operator("particle.subdivide")
@@ -2176,9 +2187,7 @@ class VIEW3D_MT_pose(Menu):
def draw(self, context):
layout = self.layout
- layout.operator("ed.undo")
- layout.operator("ed.redo")
- layout.operator("ed.undo_history")
+ layout.menu("VIEW3D_MT_undo_redo")
layout.separator()
@@ -2456,9 +2465,7 @@ class VIEW3D_MT_edit_mesh(Menu):
toolsettings = context.tool_settings
- layout.operator("ed.undo")
- layout.operator("ed.redo")
- layout.operator("ed.undo_history")
+ layout.menu("VIEW3D_MT_undo_redo")
layout.separator()
@@ -2856,6 +2863,10 @@ class VIEW3D_MT_edit_gpencil_delete(Menu):
def draw_curve(self, context):
layout = self.layout
+ layout.menu("VIEW3D_MT_undo_redo")
+
+ layout.separator()
+
layout.menu("VIEW3D_MT_edit_curve_delete")
layout.separator()
@@ -2981,6 +2992,9 @@ class VIEW3D_MT_edit_font(Menu):
def draw(self, context):
layout = self.layout
+ # Break convention of having undo menu here,
+ # instead place in "Edit" menu, matching the text menu.
+
layout.menu("VIEW3D_MT_edit_text_chars")
layout.separator()
@@ -3040,11 +3054,7 @@ class VIEW3D_MT_edit_meta(Menu):
def draw(self, context):
layout = self.layout
- toolsettings = context.tool_settings
-
- layout.operator("ed.undo")
- layout.operator("ed.redo")
- layout.operator("ed.undo_history")
+ layout.menu("VIEW3D_MT_undo_redo")
layout.separator()
@@ -3086,7 +3096,9 @@ class VIEW3D_MT_edit_lattice(Menu):
def draw(self, context):
layout = self.layout
- toolsettings = context.tool_settings
+ layout.menu("VIEW3D_MT_undo_redo")
+
+ layout.separator()
layout.menu("VIEW3D_MT_transform")
layout.menu("VIEW3D_MT_mirror")
@@ -3115,6 +3127,10 @@ class VIEW3D_MT_edit_armature(Menu):
edit_object = context.edit_object
arm = edit_object.data
+ layout.menu("VIEW3D_MT_undo_redo")
+
+ layout.separator()
+
layout.operator("armature.delete")
layout.separator()
@@ -3235,9 +3251,7 @@ class VIEW3D_MT_edit_gpencil(Menu):
layout = self.layout
- layout.operator("ed.undo")
- layout.operator("ed.redo")
- layout.operator("ed.undo_history")
+ layout.menu("VIEW3D_MT_undo_redo")
layout.separator()
@@ -4032,6 +4046,7 @@ classes = (
INFO_MT_lamp_add,
INFO_MT_camera_add,
INFO_MT_add,
+ VIEW3D_MT_undo_redo,
VIEW3D_MT_object,
VIEW3D_MT_object_animation,
VIEW3D_MT_object_clear,