blender
/
blender
128
395
Fork 567
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Fix 'Links Cut' adding undo steps without cutting anything 

The operator's return was ignored by the gesture ops that always
returned `OPERATOR_FINISHED`.

This ends by adding a undo step that brings no change.
This commit is contained in:
Germano Cavalcante 2020-09-14 09:41:22 -03:00
parent d9e2adaaf9
commit 4b14f763da
Notes: blender-bot 2023-02-14 09:03:55 +01:00 
Referenced by issue #69520, Undo doesn't work properly in Node Editor
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/windowmanager/intern/wm_gesture_ops.c
View File

@ -618,8 +618,9 @@ int WM_gesture_lines_invoke(bContext *C, wmOperator *op, const wmEvent *event)
return OPERATOR_RUNNING_MODAL;
}
static void gesture_lasso_apply(bContext *C, wmOperator *op)
static int gesture_lasso_apply(bContext *C, wmOperator *op)
{
int retval = OPERATOR_FINISHED;
wmGesture *gesture = op->customdata;
PointerRNA itemptr;
float loc[2];
@ -639,9 +640,11 @@ static void gesture_lasso_apply(bContext *C, wmOperator *op)
gesture_modal_end(C, op);
if (op->type->exec) {
int retval = op->type->exec(C, op);
retval = op->type->exec(C, op);
OPERATOR_RETVAL_CHECK(retval);
}
return retval;
}
int WM_gesture_lasso_modal(bContext *C, wmOperator *op, const wmEvent *event)
@ -683,8 +686,7 @@ int WM_gesture_lasso_modal(bContext *C, wmOperator *op, const wmEvent *event)
case MIDDLEMOUSE:
case RIGHTMOUSE:
if (event->val == KM_RELEASE) { /* key release */
gesture_lasso_apply(C, op);
return OPERATOR_FINISHED;
return gesture_lasso_apply(C, op);
}
break;
case EVT_ESCKEY: