diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-01-28 06:59:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-01-28 06:59:24 +0300 |
commit | e6a5e33c09b5563405586c5e858534343f376181 (patch) | |
tree | 796990e822da6308163cff5ddf4ae7399d1e9ec4 /source/blender/windowmanager | |
parent | 057859620d34b05bfe590620b9e770eccd36177a (diff) | |
parent | 87d3f4aff3225104cbb8be41ac0339c6a1cd9a85 (diff) |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/CMakeLists.txt | 3 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 6de36acb343..0f26ec50816 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -168,6 +168,9 @@ if(WITH_PYTHON) ../python ) add_definitions(-DWITH_PYTHON) + if(WITH_PYTHON_MODULE) + add_definitions(-DWITH_PYTHON_MODULE) + endif() endif() if(WITH_BUILDINFO) diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 608aa116239..918836041df 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -523,11 +523,15 @@ void WM_exit_ex(bContext *C, const bool do_python) } } -#ifdef WITH_PYTHON +#if defined(WITH_PYTHON) && !defined(WITH_PYTHON_MODULE) /* Without this, we there isn't a good way to manage false-positive resource leaks * where a #PyObject references memory allocated with guarded-alloc, T71362. * - * This allows add-ons to free resources when unregistered (which is good practice anyway). */ + * This allows add-ons to free resources when unregistered (which is good practice anyway). + * + * Don't run this code when built as a Python module as this runs when Python is in the + * process of shutting down, where running a snippet like this will crash, see T82675. + * Instead use the `atexit` module, installed by #BPY_python_start */ BPY_run_string_eval(C, (const char *[]){"addon_utils", NULL}, "addon_utils.disable_all()"); #endif |