b2950b2ad7
When a file passed in from the command line failed to load, blender would exit & save the quit.blend. Resolve by adding a `do_user_exit_actions` to WM_exit_ex which is false in backgrounds mode or when an error has occurred. --- Back-ported [0] & [1] from main with fix [2] included. [0]:c803ddab29[1]:d7d1c524e3[2]:d3d91b79e0
76 lines
2.1 KiB
C
76 lines
2.1 KiB
C
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
/** \file
|
|
* \ingroup pythonintern
|
|
*
|
|
* This file inserts an exit callback into Python's 'atexit' module.
|
|
* Without this sys.exit() can crash because blender is not properly closing
|
|
* resources.
|
|
*/
|
|
|
|
#include <Python.h>
|
|
|
|
#include "BLI_utildefines.h"
|
|
|
|
#include "bpy.h" /* own include */
|
|
#include "bpy_capi_utils.h"
|
|
|
|
#include "WM_api.h"
|
|
|
|
static PyObject *bpy_atexit(PyObject *UNUSED(self), PyObject *UNUSED(args), PyObject *UNUSED(kw))
|
|
{
|
|
/* close down enough of blender at least not to crash */
|
|
struct bContext *C = BPY_context_get();
|
|
|
|
WM_exit_ex(C, false, false);
|
|
|
|
Py_RETURN_NONE;
|
|
}
|
|
|
|
static PyMethodDef meth_bpy_atexit = {"bpy_atexit", (PyCFunction)bpy_atexit, METH_NOARGS, NULL};
|
|
static PyObject *func_bpy_atregister = NULL; /* borrowed reference, `atexit` holds. */
|
|
|
|
static void atexit_func_call(const char *func_name, PyObject *atexit_func_arg)
|
|
{
|
|
/* NOTE(@ideasman42): no error checking, if any of these fail we'll get a crash
|
|
* this is intended, but if its problematic it could be changed. */
|
|
|
|
PyObject *atexit_mod = PyImport_ImportModuleLevel("atexit", NULL, NULL, NULL, 0);
|
|
PyObject *atexit_func = PyObject_GetAttrString(atexit_mod, func_name);
|
|
PyObject *args = PyTuple_New(1);
|
|
PyObject *ret;
|
|
|
|
PyTuple_SET_ITEM(args, 0, atexit_func_arg);
|
|
Py_INCREF(atexit_func_arg); /* only incref so we don't dec'ref along with 'args' */
|
|
|
|
ret = PyObject_CallObject(atexit_func, args);
|
|
|
|
Py_DECREF(atexit_mod);
|
|
Py_DECREF(atexit_func);
|
|
Py_DECREF(args);
|
|
|
|
if (ret) {
|
|
Py_DECREF(ret);
|
|
}
|
|
else { /* should never happen */
|
|
PyErr_Print();
|
|
}
|
|
}
|
|
|
|
void BPY_atexit_register(void)
|
|
{
|
|
/* atexit module owns this new function reference */
|
|
BLI_assert(func_bpy_atregister == NULL);
|
|
|
|
func_bpy_atregister = (PyObject *)PyCFunction_New(&meth_bpy_atexit, NULL);
|
|
atexit_func_call("register", func_bpy_atregister);
|
|
}
|
|
|
|
void BPY_atexit_unregister(void)
|
|
{
|
|
BLI_assert(func_bpy_atregister != NULL);
|
|
|
|
atexit_func_call("unregister", func_bpy_atregister);
|
|
func_bpy_atregister = NULL; /* don't really need to set but just in case */
|
|
}
|