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>2018-04-25 11:08:04 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-04-25 11:08:04 +0300
commitf210c93945f348388646fe63e175305b1b8479c6 (patch)
tree9aa5afd96a0f1f10b87c496d4d29b1b3ee6ba920 /source/blender/editors/interface/interface_templates.c
parentd63b66be82c8fbb5faac96a3478f04e6cf4431b2 (diff)
UI: disable advanced option for redo popover
Diffstat (limited to 'source/blender/editors/interface/interface_templates.c')
-rw-r--r--source/blender/editors/interface/interface_templates.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index b22b8e02c90..29a40f4e05f 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -1551,10 +1551,12 @@ static void template_operator_redo_property_buts_draw(
else {
/* Might want to make label_align adjustable somehow. */
eAutoPropButsReturn return_info = uiTemplateOperatorPropertyButs(
- C, layout, op, template_operator_redo_property_buts_poll,
- UI_BUT_LABEL_ALIGN_NONE, layout_flags);
+ C, layout, op, r_has_advanced ? template_operator_redo_property_buts_poll : NULL,
+ UI_BUT_LABEL_ALIGN_NONE, layout_flags);
if (return_info & UI_PROP_BUTS_ANY_FAILED_CHECK) {
- *r_has_advanced = true;
+ if (r_has_advanced) {
+ *r_has_advanced = true;
+ }
}
}
}
@@ -1576,15 +1578,19 @@ void uiTemplateOperatorRedoProperties(uiLayout *layout, bContext *C)
#endif
if (WM_operator_repeat_check(C, op)) {
+#if 0
bool has_advanced = false;
+#endif
UI_block_func_set(block, ED_undo_operator_repeat_cb, op, NULL);
- template_operator_redo_property_buts_draw(C, op, layout, UI_TEMPLATE_OP_PROPS_COMPACT, &has_advanced);
+ template_operator_redo_property_buts_draw(C, op, layout, UI_TEMPLATE_OP_PROPS_COMPACT, NULL /* &has_advanced */ );
UI_block_func_set(block, NULL, NULL, NULL); /* may want to reset to old state instead of NULLing all */
+#if 0
if (has_advanced) {
uiItemO(layout, IFACE_("More..."), ICON_NONE, "SCREEN_OT_redo_last");
}
+#endif
}
}