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

WM: OP_IS_INVOKE was being incorrectly set

Browse Source 
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
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/windowmanager/intern/wm_event_system.c
View File

@@ -1089,6 +1089,9 @@ bool WM_operator_last_properties_store(wmOperator *UNUSED(op))
#endif #endif
/**
* Also used for exec when 'event' is NULL.
*/
static int wm_operator_invoke( static int wm_operator_invoke(
bContext *C, wmOperatorType *ot, wmEvent *event, bContext *C, wmOperatorType *ot, wmEvent *event,
PointerRNA *properties, ReportList *reports, const bool poll_only) 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 */ 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); 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 */ /* initialize setting from previous run */
if (!is_nested_call) { /* not called by py script */ if (!is_nested_call) { /* not called by py script */