diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-07-28 22:40:33 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-07-28 22:44:58 +0300 |
| commit | e2a7e1e4940109c09de2b0e2fc22029de3636936 (patch) | |
| tree | 189119dea842c470c8aadf0263fb982bd687ee6c /source | |
| parent | 87d5e34453249fbf53d22b63c4f2442e3f8ec32e (diff) | |
WM: OP_IS_INVOKE was being incorrectly set
Calling an operator with EXEC_* context would still set the invoke flag.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 32f978ae891..4f68e7cccca 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -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); - op->flag |= OP_IS_INVOKE; + if (event != NULL) { + op->flag |= OP_IS_INVOKE; + } /* initialize setting from previous run */ if (!is_nested_call) { /* not called by py script */ |