diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-08-11 14:32:41 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-08-11 14:32:41 +0300 |
| commit | e738d0ec6c50dd4aa404b98f930c70cf30e70844 (patch) | |
| tree | ff555865b987178d62cc3daf8cf4a249ab9a3092 /source/blender/python | |
| parent | 1b8778e314910cea940f7850a4b86e0ffb45dd65 (diff) | |
| parent | e11aa3edddf54b451645b5f32775559b5af7ee1a (diff) | |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/python')
| -rw-r--r-- | source/blender/python/intern/bpy_operator.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c index 4b2b5f129a7..274c1934e9e 100644 --- a/source/blender/python/intern/bpy_operator.c +++ b/source/blender/python/intern/bpy_operator.c @@ -227,7 +227,14 @@ static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args) context_dict_back = CTX_py_dict_get(C); - CTX_py_dict_set(C, (void *)context_dict); + /** + * It might be that there is already a Python context override. We don't want to remove that + * except when this operator call sets a new override explicitly. This is necessary so that + * called operator runs in the same context as the calling code by default. + */ + if (context_dict != NULL) { + CTX_py_dict_set(C, (void *)context_dict); + } Py_XINCREF(context_dict); /* so we done loose it */ if (WM_operator_poll_context((bContext *)C, ot, context) == false) { |