From 177d051126b3ea4a1dec6a016ae67d7f51f233d0 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Fri, 15 Apr 2016 15:17:18 +0200 Subject: UI: copy to selected: add 'single'/'all' options to buttons' menu when relevant. Same as reset or anim keyframe/driver operators... Inconsistency reported by Leon Cheung through IRC, thanks. --- source/blender/editors/interface/interface_handlers.c | 13 +++++++++++-- source/blender/editors/interface/interface_ops.c | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 023439fddee..d59d29363e6 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -6778,10 +6778,19 @@ static bool ui_but_menu(bContext *C, uiBut *but) ICON_NONE, "UI_OT_unset_property_button"); } + if (is_array_component) { + uiItemBooleanO(layout, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Copy All To Selected"), + ICON_NONE, "UI_OT_copy_to_selected_button", "all", true); + uiItemBooleanO(layout, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Copy Single To Selected"), + ICON_NONE, "UI_OT_copy_to_selected_button", "all", false); + } + else { + uiItemBooleanO(layout, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Copy To Selected"), + ICON_NONE, "UI_OT_copy_to_selected_button", "all", true); + } + uiItemO(layout, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Copy Data Path"), ICON_NONE, "UI_OT_copy_data_path_button"); - uiItemO(layout, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Copy To Selected"), - ICON_NONE, "UI_OT_copy_to_selected_button"); uiItemS(layout); } diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index bacae0a28c6..7a9c3e827cf 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -557,7 +557,7 @@ static void UI_OT_copy_to_selected_button(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "all", 1, "All", "Reset to default values all elements of the array"); + RNA_def_boolean(ot->srna, "all", true, "All", "Copy to selected all elements of the array"); } /* Reports to Textblock Operator ------------------------ */ -- cgit v1.2.3