[Bf-blender-cvs] [6fe2a48d3e1] blender2.8: Last commit broke WITH_PYTHON_SAFETY

[Campbell Barton]

Commit: 6fe2a48d3e18121624e315de0c3c65c960c9d5ec
Author: Campbell Barton
Date:   Thu Jul 27 02:12:40 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB6fe2a48d3e18121624e315de0c3c65c960c9d5ec

Last commit broke WITH_PYTHON_SAFETY

Re-enable BPY_id_release call with thats enabled.

===================================================================

M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/blenkernel/intern/library_remap.c

===================================================================

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);
 	}