Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

WM: disable undo operators in background mode & at startup

Browse Source 
Show an error instead of crashing, see: T60934
This commit is contained in:
Campbell Barton
2019-02-01 14:05:33 +11:00
parent 552b2287db
commit 1b7c361fbb
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/blender/editors/undo/ed_undo.c
View File

@@ -351,11 +351,31 @@ static int ed_undo_redo_exec(bContext *C, wmOperator *UNUSED(op))
return ret; return ret;
} }
/* Disable in background mode, we could support if it's useful, T60934. */
static bool ed_undo_is_init_poll(bContext *C)
{
wmWindowManager *wm = CTX_wm_manager(C);
if (wm->undo_stack == NULL) {
CTX_wm_operator_poll_msg_set(C, "Undo disabled in background mode or at startup");
return false;
}
return true;
}
static bool ed_undo_is_init_and_screenactive_poll(bContext *C)
{
if (ed_undo_is_init_poll(C) == false) {
return false;
}
return ED_operator_screenactive(C);
}
static bool ed_undo_redo_poll(bContext *C) static bool ed_undo_redo_poll(bContext *C)
{ {
wmOperator *last_op = WM_operator_last_redo(C); wmOperator *last_op = WM_operator_last_redo(C);
return last_op && ED_operator_screenactive(C) && return (last_op && ed_undo_is_init_and_screenactive_poll(C) &&
WM_operator_check_ui_enabled(C, last_op->type->name); WM_operator_check_ui_enabled(C, last_op->type->name));
} }
void ED_OT_undo(wmOperatorType *ot) void ED_OT_undo(wmOperatorType *ot)
@@ -367,7 +387,7 @@ void ED_OT_undo(wmOperatorType *ot)
/* api callbacks */ /* api callbacks */
ot->exec = ed_undo_exec; ot->exec = ed_undo_exec;
ot->poll = ED_operator_screenactive; ot->poll = ed_undo_is_init_and_screenactive_poll;
} }
void ED_OT_undo_push(wmOperatorType *ot) void ED_OT_undo_push(wmOperatorType *ot)
@@ -379,6 +399,7 @@ void ED_OT_undo_push(wmOperatorType *ot)
/* api callbacks */ /* api callbacks */
ot->exec = ed_undo_push_exec; ot->exec = ed_undo_push_exec;
ot->poll = ed_undo_is_init_poll;
ot->flag = OPTYPE_INTERNAL; ot->flag = OPTYPE_INTERNAL;
@@ -394,7 +415,7 @@ void ED_OT_redo(wmOperatorType *ot)
/* api callbacks */ /* api callbacks */
ot->exec = ed_redo_exec; ot->exec = ed_redo_exec;
ot->poll = ED_operator_screenactive; ot->poll = ed_undo_is_init_and_screenactive_poll;
} }
void ED_OT_undo_redo(wmOperatorType *ot) void ED_OT_undo_redo(wmOperatorType *ot)
@@ -605,7 +626,7 @@ void ED_OT_undo_history(wmOperatorType *ot)
/* api callbacks */ /* api callbacks */
ot->invoke = undo_history_invoke; ot->invoke = undo_history_invoke;
ot->exec = undo_history_exec; ot->exec = undo_history_exec;
ot->poll = ED_operator_screenactive; ot->poll = ed_undo_is_init_and_screenactive_poll;
RNA_def_int(ot->srna, "item", 0, 0, INT_MAX, "Item", "", 0, INT_MAX); RNA_def_int(ot->srna, "item", 0, 0, INT_MAX, "Item", "", 0, INT_MAX);