From 48c9208d56de08103e789ac5f8df0ccf19506f3e Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 20 Apr 2016 15:02:03 +0200 Subject: [PATCH] Fix T46903: Missing Render Border Menu items While other borders are more like a toggle, it is an intrinsic behavior of those operators. Render Border is intrinsicly split into two operators and trying to expose it as a toggle will end up with rather confusing situation when shortcut listed in the menu changes depending on the context. --- release/scripts/startup/bl_ui/space_image.py | 5 +++++ release/scripts/startup/bl_ui/space_view3d.py | 1 + source/blender/editors/space_image/image_ops.c | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 10b4e24efd9..fbea07a317e 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -113,6 +113,11 @@ class IMAGE_MT_view(Menu): layout.separator() if show_render: + layout.operator("image.render_border") + layout.operator("image.clear_render_border") + + layout.separator() + layout.operator("image.cycle_render_slot", text="Render Slot Cycle Next") layout.operator("image.cycle_render_slot", text="Render Slot Cycle Previous").reverse = True layout.separator() diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index cbcdb86c41e..8db6f81ea51 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -438,6 +438,7 @@ class VIEW3D_MT_view(Menu): layout.operator("view3d.clip_border", text="Clipping Border...") layout.operator("view3d.zoom_border", text="Zoom Border...") layout.operator("view3d.render_border", text="Render Border...").camera_only = False + layout.operator("view3d.clear_render_border") layout.separator() diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index eb74922a256..80dbfa140f6 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -3554,7 +3554,7 @@ static int clear_render_border_exec(bContext *C, wmOperator *UNUSED(op)) void IMAGE_OT_clear_render_border(wmOperatorType *ot) { /* identifiers */ - ot->name = "Render Border"; + ot->name = "Clear Render Border"; ot->description = "Clear the boundaries of the border render and disable border render"; ot->idname = "IMAGE_OT_clear_render_border";