From a7960db471011fbf67174b4ae7a64dd2052d20d1 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 23 Apr 2018 15:14:51 +0200 Subject: Static Overrides: hide/deactivate all but 'REPLACE' operation. Others remain in code for now, just not exposed to user. --- source/blender/editors/interface/interface_handlers.c | 6 ++++-- source/blender/editors/interface/interface_ops.c | 7 ++++++- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/interface') diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 6c4d652051a..5bfbe47f609 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -6777,6 +6777,7 @@ static bool ui_but_menu(bContext *C, uiBut *but) if (but->flag & UI_BUT_OVERRIDEN) { if (is_array_component) { +#if 0 /* Disabled for now. */ ot = WM_operatortype_find("UI_OT_override_type_set_button", false); uiItemFullO_ptr(layout, ot, "Overrides Type", ICON_NONE, NULL, WM_OP_INVOKE_DEFAULT, 0, &op_ptr); @@ -6784,17 +6785,18 @@ static bool ui_but_menu(bContext *C, uiBut *but) uiItemFullO_ptr(layout, ot, "Single Override Type", ICON_NONE, NULL, WM_OP_INVOKE_DEFAULT, 0, &op_ptr); RNA_boolean_set(&op_ptr, "all", false); - +#endif uiItemBooleanO(layout, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Remove Overrides"), ICON_X, "UI_OT_override_remove_button", "all", true); uiItemBooleanO(layout, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Remove Single Override"), ICON_X, "UI_OT_override_remove_button", "all", false); } else { +#if 0 /* Disabled for now. */ uiItemFullO(layout, "UI_OT_override_type_set_button", "Override Type", ICON_NONE, NULL, WM_OP_INVOKE_DEFAULT, 0, &op_ptr); RNA_boolean_set(&op_ptr, "all", false); - +#endif uiItemBooleanO(layout, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Remove Override"), ICON_X, "UI_OT_override_remove_button", "all", true); } diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index 9e31e8729d5..ef328c2cd5e 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -540,7 +540,12 @@ static int override_type_set_button_exec(bContext *C, wmOperator *op) static int override_type_set_button_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) { +#if 0 /* Disabled for now */ return WM_menu_invoke_ex(C, op, WM_OP_INVOKE_DEFAULT); +#else + RNA_enum_set(op->ptr, "type", IDOVERRIDESTATIC_OP_REPLACE); + return override_type_set_button_exec(C, op); +#endif } static void UI_OT_override_type_set_button(wmOperatorType *ot) @@ -562,7 +567,7 @@ static void UI_OT_override_type_set_button(wmOperatorType *ot) RNA_def_boolean(ot->srna, "all", 1, "All", "Reset to default values all elements of the array"); ot->prop = RNA_def_enum(ot->srna, "type", override_type_items, UIOverride_Type_Replace, "Type", "Type of override operation"); - /* TODO: add itemf callback, not all aoptions are available for all data types... */ + /* TODO: add itemf callback, not all options are available for all data types... */ } -- cgit v1.2.3