diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-11-13 16:59:44 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-11-13 16:59:44 +0300 |
| commit | d7b3b3b22fca3267f9be8c8ae2e8f6fb7b9fb617 (patch) | |
| tree | d6df3ad0dafa2a115df0bafe60b266ea3ce99a2f /source/blender/windowmanager | |
| parent | 5ff7827980e3b3e598a7f630f8b2a3c90222ac70 (diff) | |
| parent | c7b77222542ce2e4eda548c51aa33013dddc0480 (diff) | |
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index e85f42697df..83551a86211 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -2857,6 +2857,16 @@ static int radial_control_modal(bContext *C, wmOperator *op, const wmEvent *even ED_region_tag_redraw(CTX_wm_region(C)); radial_control_update_header(op, C); + if (ret & OPERATOR_FINISHED) { + wmWindowManager *wm = CTX_wm_manager(C); + if (wm->op_undo_depth == 0) { + ID *id = rc->ptr.owner_id; + if (ED_undo_is_legacy_compatible_for_property(C, id)) { + ED_undo_push(C, op->type->name); + } + } + } + if (ret != OPERATOR_RUNNING_MODAL) { radial_control_cancel(C, op); } @@ -2874,7 +2884,7 @@ static void WM_OT_radial_control(wmOperatorType *ot) ot->modal = radial_control_modal; ot->cancel = radial_control_cancel; - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING; + ot->flag = OPTYPE_REGISTER | OPTYPE_BLOCKING; /* all paths relative to the context */ PropertyRNA *prop; |