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:
authorCampbell Barton <ideasman42@gmail.com>2016-02-25 12:36:06 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-02-25 12:38:06 +0300
commitba98b681e7e59ed61c8ce68ee8277f401d95e067 (patch)
tree15604f1870d427c470ed6312645a4f699fac8efa /release
parent3f602fff3c4093e2fb7efa2d46fe75aed8e2cdcf (diff)
3D View: correct menu for moving out of local-view
Also name more clearly
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index b11e1ddf008..f38c0d50fb7 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -1226,6 +1226,8 @@ class VIEW3D_MT_object(Menu):
def draw(self, context):
layout = self.layout
+ view = context.space_data
+ is_local_view = (view.local_view is not None)
layout.operator("ed.undo")
layout.operator("ed.redo")
@@ -1277,7 +1279,13 @@ class VIEW3D_MT_object(Menu):
layout.separator()
- layout.operator("object.move_to_layer", text="Move to Layer...")
+ if is_local_view:
+ layout.operator_context = 'EXEC_REGION_WIN'
+ layout.operator("object.move_to_layer", text="Move out of Local View")
+ layout.operator_context = 'INVOKE_REGION_WIN'
+ else:
+ layout.operator("object.move_to_layer", text="Move to Layer...")
+
layout.menu("VIEW3D_MT_object_showhide")
layout.operator_menu_enum("object.convert", "target")