diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-07-26 19:12:40 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-07-26 19:12:40 +0300 |
| commit | 6fe2a48d3e18121624e315de0c3c65c960c9d5ec (patch) | |
| tree | feb2730deb3038d921a80cd4e4b093da6cc35322 /source | |
| parent | 0b5f056119785c040d38121fb6241b12e31f3118 (diff) | |
Last commit broke WITH_PYTHON_SAFETY
Re-enable BPY_id_release call with thats enabled.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/library_remap.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 1d4565f1ec6..2a3d4c9fed7 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -431,6 +431,10 @@ if(WITH_PYTHON) ) add_definitions(-DWITH_PYTHON) + if(WITH_PYTHON_SAFETY) + add_definitions(-DWITH_PYTHON_SAFETY) + endif() + if(WITH_PYTHON_SECURITY) add_definitions(-DWITH_PYTHON_SECURITY) endif() diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c index 68212495f03..7310370ca10 100644 --- a/source/blender/blenkernel/intern/library_remap.c +++ b/source/blender/blenkernel/intern/library_remap.c @@ -893,6 +893,9 @@ void BKE_libblock_free_ex(Main *bmain, void *idv, const bool do_id_user, const b DEG_id_type_tag(bmain, type); #ifdef WITH_PYTHON +#ifdef WITH_PYTHON_SAFETY + BPY_id_release(id); +#endif if (id->py_instance) { BPY_DECREF_RNA_INVALIDATE(id->py_instance); } |