From ba98b681e7e59ed61c8ce68ee8277f401d95e067 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 25 Feb 2016 20:36:06 +1100 Subject: [PATCH] 3D View: correct menu for moving out of local-view Also name more clearly --- release/scripts/startup/bl_ui/space_view3d.py | 10 +++++++++- source/blender/editors/object/object_relations.c | 2 +- 2 files changed, 10 insertions(+), 2 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") diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 41b9c95bc77..1a3209a8ca8 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -1338,7 +1338,7 @@ static int move_to_layer_invoke(bContext *C, wmOperator *op, const wmEvent *even { View3D *v3d = CTX_wm_view3d(C); if (v3d && v3d->localvd) { - return WM_operator_confirm_message(C, op, "Move from localview"); + return WM_operator_confirm_message(C, op, "Move out of Local View"); } else { move_to_layer_init(C, op);