diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-25 08:52:40 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-25 08:55:50 +0300 |
commit | b00d971efe67799042577cf0391bb34e9f870835 (patch) | |
tree | 256b9796c0090c5ff2340bbe3b02d4b32ca65b12 /source/blender/editors/include | |
parent | e944e215bf300cd1cea8698391679df1e3802a92 (diff) |
UI: Apply remove redo region
This was a disabled part of the top-bar merge (code by @Severin)
The only change made is to move to redo UI into a popover.
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r-- | source/blender/editors/include/ED_undo.h | 2 | ||||
-rw-r--r-- | source/blender/editors/include/UI_interface.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/include/ED_undo.h b/source/blender/editors/include/ED_undo.h index da8cd95555c..6df568a6bc9 100644 --- a/source/blender/editors/include/ED_undo.h +++ b/source/blender/editors/include/ED_undo.h @@ -52,7 +52,6 @@ int ED_undo_operator_repeat(struct bContext *C, struct wmOperator *op); void ED_undo_operator_repeat_cb(struct bContext *C, void *arg_op, void *arg_unused); void ED_undo_operator_repeat_cb_evt(struct bContext *C, void *arg_op, int arg_unused); -#ifdef WITH_REDO_REGION_REMOVAL /* Context sanity helpers for operator repeat. */ typedef struct OperatorRepeatContextHandle OperatorRepeatContextHandle; @@ -60,7 +59,6 @@ const OperatorRepeatContextHandle *ED_operator_repeat_prepare_context( struct bContext *C, struct wmOperator *op) ATTR_WARN_UNUSED_RESULT; void ED_operator_repeat_reset_context( struct bContext *C, const OperatorRepeatContextHandle *context_info); -#endif bool ED_undo_is_valid(const struct bContext *C, const char *undoname); diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index 38d89a4099d..a9fb328ab8b 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -1001,9 +1001,9 @@ void uiTemplateSearchPreview( void uiTemplatePathBuilder(uiLayout *layout, struct PointerRNA *ptr, const char *propname, struct PointerRNA *root_ptr, const char *text); uiLayout *uiTemplateModifier(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr); -#ifdef WITH_REDO_REGION_REMOVAL + void uiTemplateOperatorRedoProperties(uiLayout *layout, struct bContext *C); -#endif + uiLayout *uiTemplateConstraint(uiLayout *layout, struct PointerRNA *ptr); void uiTemplatePreview(uiLayout *layout, struct bContext *C, struct ID *id, int show_buttons, struct ID *parent, struct MTex *slot, const char *preview_id); |