WM: OP_IS_INVOKE was being incorrectly set

Calling an operator with EXEC_* context would still set the invoke flag.
This commit is contained in:
Campbell Barton
2017-07-29 05:40:33 +10:00
parent 87d5e34453
commit e2a7e1e494

View File

@@ -1089,6 +1089,9 @@ bool WM_operator_last_properties_store(wmOperator *UNUSED(op))
#endif
/**
* Also used for exec when 'event' is NULL.
*/
static int wm_operator_invoke(
bContext *C, wmOperatorType *ot, wmEvent *event,
PointerRNA *properties, ReportList *reports, const bool poll_only)
@@ -1104,7 +1107,9 @@ static int wm_operator_invoke(
wmOperator *op = wm_operator_create(wm, ot, properties, reports); /* if reports == NULL, they'll be initialized */
const bool is_nested_call = (wm->op_undo_depth != 0);
if (event != NULL) {
op->flag |= OP_IS_INVOKE;
}
/* initialize setting from previous run */
if (!is_nested_call) { /* not called by py script */